You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/07/26 12:22:19 UTC

[32/32] git commit: [OLINGO-377] Merge branch 'master' into OLINGO-377-FIT

[OLINGO-377] Merge branch 'master' into OLINGO-377-FIT


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

Branch: refs/heads/OLINGO-377-FIT
Commit: 6e7231943b817843a34ce9a3bbb75c63ae23d4c4
Parents: 49a38af 633ef32
Author: mibo <mi...@mirb.de>
Authored: Sat Jul 26 11:58:08 2014 +0200
Committer: mibo <mi...@mirb.de>
Committed: Sat Jul 26 11:58:08 2014 +0200

----------------------------------------------------------------------
 .../olingo/ext/proxy/AbstractService.java       |  3 +-
 .../olingo/ext/proxy/api/ComposableInvoker.java | 24 +++++
 .../apache/olingo/ext/proxy/api/Invoker.java    |  4 +
 .../apache/olingo/ext/proxy/api/Operations.java | 22 +++++
 .../StructuredCollectionComposableInvoker.java  | 24 +++++
 .../proxy/api/StructuredCollectionInvoker.java  |  2 +-
 .../proxy/api/StructuredComposableInvoker.java  | 23 +++++
 .../olingo/ext/proxy/api/StructuredInvoker.java |  2 +-
 .../proxy/commons/EntityInvocationHandler.java  | 32 ++++++-
 .../ext/proxy/commons/InvokerHandler.java       | 87 ++++++++++++++----
 .../commons/OperationInvocationHandler.java     | 21 +++--
 .../olingo/ext/proxy/utils/ClassUtils.java      | 14 ++-
 .../src/main/resources/complexCollection.vm     |  2 -
 .../src/main/resources/complexType.vm           |  4 +-
 .../src/main/resources/container.vm             | 20 +++--
 .../src/main/resources/entityCollection.vm      |  2 -
 .../src/main/resources/entitySet.vm             |  2 -
 .../src/main/resources/entityType.vm            |  4 +-
 .../src/main/resources/operation.vm             | 23 +++--
 .../java/org/apache/olingo/fit/V4Services.java  | 13 +++
 .../fit/proxy/v3/actionoverloading/Service.java |  1 -
 .../AllGeoCollectionTypesSet.java               |  8 +-
 .../astoriadefaultservice/AllGeoTypesSet.java   |  8 +-
 .../services/astoriadefaultservice/Car.java     |  8 +-
 .../astoriadefaultservice/Computer.java         |  8 +-
 .../astoriadefaultservice/ComputerDetail.java   |  8 +-
 .../astoriadefaultservice/Customer.java         |  8 +-
 .../astoriadefaultservice/CustomerInfo.java     |  8 +-
 .../astoriadefaultservice/DefaultContainer.java |  3 +-
 .../services/astoriadefaultservice/Driver.java  |  8 +-
 .../astoriadefaultservice/LastLogin.java        |  8 +-
 .../services/astoriadefaultservice/License.java |  8 +-
 .../services/astoriadefaultservice/Login.java   |  8 +-
 .../astoriadefaultservice/MappedEntityType.java |  8 +-
 .../services/astoriadefaultservice/Message.java |  8 +-
 .../MessageAttachment.java                      |  8 +-
 .../services/astoriadefaultservice/Order.java   |  8 +-
 .../astoriadefaultservice/OrderLine.java        |  8 +-
 .../astoriadefaultservice/PageView.java         |  8 +-
 .../services/astoriadefaultservice/Person.java  |  8 +-
 .../astoriadefaultservice/PersonMetadata.java   |  8 +-
 .../services/astoriadefaultservice/Product.java |  8 +-
 .../astoriadefaultservice/ProductDetail.java    |  8 +-
 .../astoriadefaultservice/ProductPhoto.java     |  8 +-
 .../astoriadefaultservice/ProductReview.java    |  8 +-
 .../astoriadefaultservice/RSAToken.java         |  8 +-
 .../astoriadefaultservice/package-info.java     |  1 -
 .../astoriadefaultservice/types/Aliases.java    |  6 +-
 .../types/AliasesCollection.java                |  6 +-
 .../types/AllSpatialCollectionTypes.java        |  6 +-
 .../AllSpatialCollectionTypesCollection.java    |  6 +-
 .../types/AllSpatialCollectionTypes_Simple.java |  7 +-
 ...SpatialCollectionTypes_SimpleCollection.java |  6 +-
 .../types/AllSpatialTypes.java                  |  6 +-
 .../types/AllSpatialTypesCollection.java        |  6 +-
 .../astoriadefaultservice/types/AuditInfo.java  |  6 +-
 .../types/AuditInfoCollection.java              |  6 +-
 .../types/BackOrderLine.java                    |  3 +-
 .../types/BackOrderLine2.java                   |  3 +-
 .../types/BackOrderLine2Collection.java         |  6 +-
 .../types/BackOrderLineCollection.java          |  6 +-
 .../astoriadefaultservice/types/Car.java        |  6 +-
 .../types/CarCollection.java                    |  6 +-
 .../types/ComplexToCategory.java                |  6 +-
 .../types/ComplexToCategoryCollection.java      |  6 +-
 .../astoriadefaultservice/types/Computer.java   |  6 +-
 .../types/ComputerCollection.java               |  6 +-
 .../types/ComputerDetail.java                   |  6 +-
 .../types/ComputerDetailCollection.java         |  6 +-
 .../types/ConcurrencyInfo.java                  |  6 +-
 .../types/ConcurrencyInfoCollection.java        |  6 +-
 .../types/ContactDetails.java                   |  6 +-
 .../types/ContactDetailsCollection.java         |  6 +-
 .../astoriadefaultservice/types/Contractor.java |  3 +-
 .../types/ContractorCollection.java             |  6 +-
 .../astoriadefaultservice/types/Customer.java   |  6 +-
 .../types/CustomerCollection.java               |  6 +-
 .../types/CustomerInfo.java                     |  6 +-
 .../types/CustomerInfoCollection.java           |  6 +-
 .../astoriadefaultservice/types/Dimensions.java |  6 +-
 .../types/DimensionsCollection.java             |  6 +-
 .../types/DiscontinuedProduct.java              |  3 +-
 .../types/DiscontinuedProductCollection.java    |  6 +-
 .../astoriadefaultservice/types/Driver.java     |  6 +-
 .../types/DriverCollection.java                 |  6 +-
 .../astoriadefaultservice/types/Employee.java   |  3 +-
 .../types/EmployeeCollection.java               |  3 +-
 .../astoriadefaultservice/types/LastLogin.java  |  6 +-
 .../types/LastLoginCollection.java              |  6 +-
 .../astoriadefaultservice/types/License.java    |  6 +-
 .../types/LicenseCollection.java                |  6 +-
 .../astoriadefaultservice/types/Login.java      |  6 +-
 .../types/LoginCollection.java                  |  6 +-
 .../types/MappedEntityType.java                 |  6 +-
 .../types/MappedEntityTypeCollection.java       |  6 +-
 .../astoriadefaultservice/types/Message.java    |  6 +-
 .../types/MessageAttachment.java                |  6 +-
 .../types/MessageAttachmentCollection.java      |  6 +-
 .../types/MessageCollection.java                |  6 +-
 .../astoriadefaultservice/types/MessageKey.java |  1 -
 .../astoriadefaultservice/types/Order.java      |  6 +-
 .../types/OrderCollection.java                  |  6 +-
 .../astoriadefaultservice/types/OrderLine.java  |  3 +-
 .../types/OrderLineCollection.java              |  6 +-
 .../types/OrderLineKey.java                     |  1 -
 .../astoriadefaultservice/types/PageView.java   |  6 +-
 .../types/PageViewCollection.java               |  6 +-
 .../astoriadefaultservice/types/Person.java     |  3 +-
 .../types/PersonCollection.java                 |  6 +-
 .../types/PersonMetadata.java                   |  6 +-
 .../types/PersonMetadataCollection.java         |  6 +-
 .../astoriadefaultservice/types/Phone.java      |  6 +-
 .../types/PhoneCollection.java                  |  6 +-
 .../astoriadefaultservice/types/Product.java    |  3 +-
 .../types/ProductCollection.java                |  6 +-
 .../types/ProductDetail.java                    |  6 +-
 .../types/ProductDetailCollection.java          |  6 +-
 .../types/ProductPageView.java                  |  7 +-
 .../types/ProductPageViewCollection.java        |  6 +-
 .../types/ProductPhoto.java                     |  6 +-
 .../types/ProductPhotoCollection.java           |  6 +-
 .../types/ProductPhotoKey.java                  |  1 -
 .../types/ProductReview.java                    |  6 +-
 .../types/ProductReviewCollection.java          |  6 +-
 .../types/ProductReviewKey.java                 |  1 -
 .../astoriadefaultservice/types/RSAToken.java   |  6 +-
 .../types/RSATokenCollection.java               |  6 +-
 .../types/SpecialEmployee.java                  |  3 +-
 .../types/SpecialEmployeeCollection.java        |  3 +-
 .../types/package-info.java                     |  1 -
 .../olingo/fit/proxy/v3/opentype/Service.java   |  1 -
 .../opentypesservicev3/DefaultContainer.java    |  3 +-
 .../odata/services/opentypesservicev3/Row.java  |  8 +-
 .../services/opentypesservicev3/RowIndex.java   |  8 +-
 .../opentypesservicev3/package-info.java        |  1 -
 .../types/ContactDetails.java                   |  6 +-
 .../types/ContactDetailsCollection.java         |  6 +-
 .../opentypesservicev3/types/IndexedRow.java    |  7 +-
 .../types/IndexedRowCollection.java             |  6 +-
 .../services/opentypesservicev3/types/Row.java  |  6 +-
 .../opentypesservicev3/types/RowCollection.java |  6 +-
 .../opentypesservicev3/types/RowIndex.java      |  6 +-
 .../types/RowIndexCollection.java               |  6 +-
 .../opentypesservicev3/types/package-info.java  |  1 -
 .../fit/proxy/v3/primitivekeys/Service.java     |  1 -
 .../primitivekeysservice/EdmBinarySet.java      |  8 +-
 .../primitivekeysservice/EdmBooleanSet.java     |  8 +-
 .../primitivekeysservice/EdmByteSet.java        |  8 +-
 .../EdmDateTimeOffsetSet.java                   |  8 +-
 .../primitivekeysservice/EdmDateTimeSet.java    |  8 +-
 .../primitivekeysservice/EdmDecimalSet.java     |  8 +-
 .../primitivekeysservice/EdmDoubleSet.java      |  8 +-
 .../primitivekeysservice/EdmGuidSet.java        |  8 +-
 .../primitivekeysservice/EdmInt16Set.java       |  8 +-
 .../primitivekeysservice/EdmInt32Set.java       |  8 +-
 .../primitivekeysservice/EdmInt64Set.java       |  8 +-
 .../primitivekeysservice/EdmSingleSet.java      |  8 +-
 .../primitivekeysservice/EdmStringSet.java      |  8 +-
 .../primitivekeysservice/EdmTimeSet.java        |  8 +-
 .../services/primitivekeysservice/Folders.java  |  8 +-
 .../primitivekeysservice/TestContext.java       |  3 +-
 .../primitivekeysservice/package-info.java      |  1 -
 .../primitivekeysservice/types/EdmBinary.java   |  6 +-
 .../types/EdmBinaryCollection.java              |  6 +-
 .../primitivekeysservice/types/EdmBoolean.java  |  6 +-
 .../types/EdmBooleanCollection.java             |  6 +-
 .../primitivekeysservice/types/EdmByte.java     |  6 +-
 .../types/EdmByteCollection.java                |  6 +-
 .../primitivekeysservice/types/EdmDateTime.java |  6 +-
 .../types/EdmDateTimeCollection.java            |  6 +-
 .../types/EdmDateTimeOffset.java                |  6 +-
 .../types/EdmDateTimeOffsetCollection.java      |  6 +-
 .../primitivekeysservice/types/EdmDecimal.java  |  6 +-
 .../types/EdmDecimalCollection.java             |  6 +-
 .../primitivekeysservice/types/EdmDouble.java   |  6 +-
 .../types/EdmDoubleCollection.java              |  6 +-
 .../primitivekeysservice/types/EdmGuid.java     |  6 +-
 .../types/EdmGuidCollection.java                |  6 +-
 .../primitivekeysservice/types/EdmInt16.java    |  6 +-
 .../types/EdmInt16Collection.java               |  6 +-
 .../primitivekeysservice/types/EdmInt32.java    |  6 +-
 .../types/EdmInt32Collection.java               |  6 +-
 .../primitivekeysservice/types/EdmInt64.java    |  6 +-
 .../types/EdmInt64Collection.java               |  6 +-
 .../primitivekeysservice/types/EdmSingle.java   |  6 +-
 .../types/EdmSingleCollection.java              |  6 +-
 .../primitivekeysservice/types/EdmString.java   |  6 +-
 .../types/EdmStringCollection.java              |  6 +-
 .../primitivekeysservice/types/EdmTime.java     |  6 +-
 .../types/EdmTimeCollection.java                |  6 +-
 .../primitivekeysservice/types/Folder.java      |  6 +-
 .../types/FolderCollection.java                 |  6 +-
 .../types/package-info.java                     |  1 -
 .../fit/proxy/v3/staticservice/Service.java     |  1 -
 .../AllGeoCollectionTypesSet.java               |  8 +-
 .../astoriadefaultservice/AllGeoTypesSet.java   |  8 +-
 .../services/astoriadefaultservice/Car.java     |  8 +-
 .../astoriadefaultservice/Computer.java         |  8 +-
 .../astoriadefaultservice/ComputerDetail.java   |  8 +-
 .../astoriadefaultservice/Customer.java         |  8 +-
 .../astoriadefaultservice/CustomerInfo.java     |  8 +-
 .../astoriadefaultservice/DefaultContainer.java |  3 +-
 .../services/astoriadefaultservice/Driver.java  |  8 +-
 .../astoriadefaultservice/LastLogin.java        |  8 +-
 .../services/astoriadefaultservice/License.java |  8 +-
 .../services/astoriadefaultservice/Login.java   |  8 +-
 .../astoriadefaultservice/MappedEntityType.java |  8 +-
 .../services/astoriadefaultservice/Message.java |  8 +-
 .../MessageAttachment.java                      |  8 +-
 .../services/astoriadefaultservice/Order.java   |  8 +-
 .../astoriadefaultservice/OrderLine.java        |  8 +-
 .../astoriadefaultservice/PageView.java         |  8 +-
 .../services/astoriadefaultservice/Person.java  |  8 +-
 .../astoriadefaultservice/PersonMetadata.java   |  8 +-
 .../services/astoriadefaultservice/Product.java |  8 +-
 .../astoriadefaultservice/ProductDetail.java    |  8 +-
 .../astoriadefaultservice/ProductPhoto.java     |  8 +-
 .../astoriadefaultservice/ProductReview.java    |  8 +-
 .../astoriadefaultservice/RSAToken.java         |  8 +-
 .../astoriadefaultservice/package-info.java     |  1 -
 .../astoriadefaultservice/types/Aliases.java    |  6 +-
 .../types/AliasesCollection.java                |  6 +-
 .../types/AllSpatialCollectionTypes.java        |  6 +-
 .../AllSpatialCollectionTypesCollection.java    |  6 +-
 .../types/AllSpatialCollectionTypes_Simple.java |  7 +-
 ...SpatialCollectionTypes_SimpleCollection.java |  6 +-
 .../types/AllSpatialTypes.java                  |  6 +-
 .../types/AllSpatialTypesCollection.java        |  6 +-
 .../astoriadefaultservice/types/AuditInfo.java  |  6 +-
 .../types/AuditInfoCollection.java              |  6 +-
 .../types/BackOrderLine.java                    |  7 +-
 .../types/BackOrderLine2.java                   |  7 +-
 .../types/BackOrderLine2Collection.java         |  6 +-
 .../types/BackOrderLineCollection.java          |  6 +-
 .../astoriadefaultservice/types/Car.java        |  6 +-
 .../types/CarCollection.java                    |  6 +-
 .../types/ComplexToCategory.java                |  6 +-
 .../types/ComplexToCategoryCollection.java      |  6 +-
 .../types/ComplexWithAllPrimitiveTypes.java     |  6 +-
 .../ComplexWithAllPrimitiveTypesCollection.java |  6 +-
 .../astoriadefaultservice/types/Computer.java   |  3 +-
 .../types/ComputerCollection.java               |  6 +-
 .../types/ComputerDetail.java                   |  3 +-
 .../types/ComputerDetailCollection.java         |  6 +-
 .../types/ConcurrencyInfo.java                  |  6 +-
 .../types/ConcurrencyInfoCollection.java        |  6 +-
 .../types/ContactDetails.java                   |  6 +-
 .../types/ContactDetailsCollection.java         |  6 +-
 .../astoriadefaultservice/types/Contractor.java |  7 +-
 .../types/ContractorCollection.java             |  6 +-
 .../astoriadefaultservice/types/Customer.java   |  6 +-
 .../types/CustomerCollection.java               |  6 +-
 .../types/CustomerInfo.java                     |  6 +-
 .../types/CustomerInfoCollection.java           |  6 +-
 .../astoriadefaultservice/types/Dimensions.java |  6 +-
 .../types/DimensionsCollection.java             |  6 +-
 .../types/DiscontinuedProduct.java              |  3 +-
 .../types/DiscontinuedProductCollection.java    |  6 +-
 .../astoriadefaultservice/types/Driver.java     |  6 +-
 .../types/DriverCollection.java                 |  6 +-
 .../astoriadefaultservice/types/Employee.java   |  4 +-
 .../types/EmployeeCollection.java               |  3 +-
 .../astoriadefaultservice/types/LastLogin.java  |  6 +-
 .../types/LastLoginCollection.java              |  6 +-
 .../astoriadefaultservice/types/License.java    |  6 +-
 .../types/LicenseCollection.java                |  6 +-
 .../astoriadefaultservice/types/Login.java      |  6 +-
 .../types/LoginCollection.java                  |  6 +-
 .../types/MappedEntityType.java                 |  6 +-
 .../types/MappedEntityTypeCollection.java       |  6 +-
 .../astoriadefaultservice/types/Message.java    |  6 +-
 .../types/MessageAttachment.java                |  6 +-
 .../types/MessageAttachmentCollection.java      |  6 +-
 .../types/MessageCollection.java                |  6 +-
 .../astoriadefaultservice/types/MessageKey.java |  1 -
 .../astoriadefaultservice/types/Order.java      |  6 +-
 .../types/OrderCollection.java                  |  6 +-
 .../astoriadefaultservice/types/OrderLine.java  |  6 +-
 .../types/OrderLineCollection.java              |  6 +-
 .../types/OrderLineKey.java                     |  1 -
 .../astoriadefaultservice/types/PageView.java   |  6 +-
 .../types/PageViewCollection.java               |  6 +-
 .../astoriadefaultservice/types/Person.java     |  6 +-
 .../types/PersonCollection.java                 |  6 +-
 .../types/PersonMetadata.java                   |  6 +-
 .../types/PersonMetadataCollection.java         |  6 +-
 .../astoriadefaultservice/types/Phone.java      |  6 +-
 .../types/PhoneCollection.java                  |  6 +-
 .../astoriadefaultservice/types/Product.java    |  3 +-
 .../types/ProductCollection.java                |  6 +-
 .../types/ProductDetail.java                    |  6 +-
 .../types/ProductDetailCollection.java          |  6 +-
 .../types/ProductPageView.java                  |  7 +-
 .../types/ProductPageViewCollection.java        |  6 +-
 .../types/ProductPhoto.java                     |  6 +-
 .../types/ProductPhotoCollection.java           |  6 +-
 .../types/ProductPhotoKey.java                  |  1 -
 .../types/ProductReview.java                    |  6 +-
 .../types/ProductReviewCollection.java          |  6 +-
 .../types/ProductReviewKey.java                 |  1 -
 .../astoriadefaultservice/types/RSAToken.java   |  6 +-
 .../types/RSATokenCollection.java               |  6 +-
 .../types/SpecialEmployee.java                  |  3 +-
 .../types/SpecialEmployeeCollection.java        |  6 +-
 .../types/package-info.java                     |  1 -
 .../fit/proxy/v4/APIBasicDesignTestITCase.java  | 48 ++++++++--
 .../olingo/fit/proxy/v4/AsyncTestITCase.java    | 30 ++++++-
 .../v4/OperationImportInvokeTestITCase.java     | 12 +--
 .../olingo/fit/proxy/v4/demo/Service.java       |  1 -
 .../proxy/v4/demo/odatademo/Advertisements.java |  8 +-
 .../fit/proxy/v4/demo/odatademo/Categories.java |  8 +-
 .../proxy/v4/demo/odatademo/DemoService.java    |  3 +-
 .../proxy/v4/demo/odatademo/PersonDetails.java  |  8 +-
 .../fit/proxy/v4/demo/odatademo/Persons.java    |  8 +-
 .../proxy/v4/demo/odatademo/ProductDetails.java |  8 +-
 .../fit/proxy/v4/demo/odatademo/Products.java   |  8 +-
 .../fit/proxy/v4/demo/odatademo/Suppliers.java  |  8 +-
 .../proxy/v4/demo/odatademo/package-info.java   |  1 -
 .../proxy/v4/demo/odatademo/types/Address.java  |  6 +-
 .../demo/odatademo/types/AddressCollection.java |  6 +-
 .../v4/demo/odatademo/types/Advertisement.java  |  6 +-
 .../types/AdvertisementCollection.java          |  6 +-
 .../proxy/v4/demo/odatademo/types/Category.java |  6 +-
 .../odatademo/types/CategoryCollection.java     |  6 +-
 .../proxy/v4/demo/odatademo/types/Customer.java |  7 +-
 .../odatademo/types/CustomerCollection.java     |  6 +-
 .../proxy/v4/demo/odatademo/types/Employee.java |  7 +-
 .../odatademo/types/EmployeeCollection.java     |  6 +-
 .../demo/odatademo/types/FeaturedProduct.java   |  3 +-
 .../types/FeaturedProductCollection.java        |  6 +-
 .../proxy/v4/demo/odatademo/types/Person.java   |  6 +-
 .../demo/odatademo/types/PersonCollection.java  |  6 +-
 .../v4/demo/odatademo/types/PersonDetail.java   |  6 +-
 .../odatademo/types/PersonDetailCollection.java |  6 +-
 .../proxy/v4/demo/odatademo/types/Product.java  |  3 +-
 .../demo/odatademo/types/ProductCollection.java |  6 +-
 .../v4/demo/odatademo/types/ProductDetail.java  |  6 +-
 .../types/ProductDetailCollection.java          |  6 +-
 .../proxy/v4/demo/odatademo/types/Supplier.java |  6 +-
 .../odatademo/types/SupplierCollection.java     |  6 +-
 .../v4/demo/odatademo/types/package-info.java   |  1 -
 .../olingo/fit/proxy/v4/opentype/Service.java   |  1 -
 .../opentypesservicev4/DefaultContainer.java    |  3 +-
 .../odata/services/opentypesservicev4/Row.java  |  8 +-
 .../services/opentypesservicev4/RowIndex.java   |  8 +-
 .../opentypesservicev4/package-info.java        |  1 -
 .../opentypesservicev4/types/AccountInfo.java   |  6 +-
 .../types/AccountInfoCollection.java            |  6 +-
 .../opentypesservicev4/types/Color.java         |  1 -
 .../types/ContactDetails.java                   |  6 +-
 .../types/ContactDetailsCollection.java         |  6 +-
 .../opentypesservicev4/types/IndexedRow.java    |  7 +-
 .../types/IndexedRowCollection.java             |  6 +-
 .../services/opentypesservicev4/types/Row.java  |  6 +-
 .../opentypesservicev4/types/RowCollection.java |  6 +-
 .../opentypesservicev4/types/RowIndex.java      |  6 +-
 .../types/RowIndexCollection.java               |  6 +-
 .../opentypesservicev4/types/package-info.java  |  1 -
 .../fit/proxy/v4/staticservice/Service.java     |  1 -
 .../services/odatawcfservice/Accounts.java      |  8 +-
 .../services/odatawcfservice/Customers.java     |  8 +-
 .../services/odatawcfservice/Departments.java   |  8 +-
 .../services/odatawcfservice/Employees.java     |  8 +-
 .../odatawcfservice/InMemoryEntities.java       |  9 +-
 .../services/odatawcfservice/OrderDetails.java  |  8 +-
 .../odata/services/odatawcfservice/Orders.java  |  8 +-
 .../odata/services/odatawcfservice/People.java  |  8 +-
 .../odatawcfservice/ProductDetails.java         |  8 +-
 .../odatawcfservice/ProductReviews.java         |  8 +-
 .../services/odatawcfservice/Products.java      |  8 +-
 .../services/odatawcfservice/StoredPIs.java     |  8 +-
 .../odatawcfservice/SubscriptionTemplates.java  |  8 +-
 .../services/odatawcfservice/package-info.java  |  1 -
 .../odatawcfservice/types/AccessLevel.java      |  1 -
 .../services/odatawcfservice/types/Account.java |  3 +-
 .../types/AccountCollection.java                |  6 +-
 .../odatawcfservice/types/AccountInfo.java      |  6 +-
 .../types/AccountInfoCollection.java            |  6 +-
 .../services/odatawcfservice/types/Address.java |  6 +-
 .../types/AddressCollection.java                |  6 +-
 .../services/odatawcfservice/types/Asset.java   |  6 +-
 .../odatawcfservice/types/AssetCollection.java  |  6 +-
 .../services/odatawcfservice/types/Club.java    |  6 +-
 .../odatawcfservice/types/ClubCollection.java   |  6 +-
 .../services/odatawcfservice/types/Color.java   |  1 -
 .../services/odatawcfservice/types/Company.java |  3 +-
 .../odatawcfservice/types/CompanyAddress.java   |  7 +-
 .../types/CompanyAddressCollection.java         |  6 +-
 .../odatawcfservice/types/CompanyCategory.java  |  1 -
 .../types/CompanyCollection.java                |  6 +-
 .../odatawcfservice/types/CreditCardPI.java     |  7 +-
 .../types/CreditCardPICollection.java           |  6 +-
 .../odatawcfservice/types/CreditRecord.java     |  6 +-
 .../types/CreditRecordCollection.java           |  6 +-
 .../odatawcfservice/types/Customer.java         |  3 +-
 .../types/CustomerCollection.java               |  6 +-
 .../odatawcfservice/types/Department.java       |  6 +-
 .../types/DepartmentCollection.java             |  6 +-
 .../odatawcfservice/types/Employee.java         |  3 +-
 .../types/EmployeeCollection.java               |  6 +-
 .../odatawcfservice/types/GiftCard.java         |  3 +-
 .../types/GiftCardCollection.java               |  6 +-
 .../odatawcfservice/types/HomeAddress.java      |  7 +-
 .../types/HomeAddressCollection.java            |  6 +-
 .../services/odatawcfservice/types/IsBoss.java  |  1 -
 .../odatawcfservice/types/LabourUnion.java      |  6 +-
 .../types/LabourUnionCollection.java            |  6 +-
 .../services/odatawcfservice/types/Order.java   |  6 +-
 .../odatawcfservice/types/OrderCollection.java  |  6 +-
 .../odatawcfservice/types/OrderDetail.java      |  6 +-
 .../types/OrderDetailCollection.java            |  6 +-
 .../odatawcfservice/types/OrderDetailKey.java   |  1 -
 .../types/PaymentInstrument.java                |  6 +-
 .../types/PaymentInstrumentCollection.java      |  6 +-
 .../services/odatawcfservice/types/Person.java  |  3 +-
 .../odatawcfservice/types/PersonCollection.java |  6 +-
 .../services/odatawcfservice/types/Product.java |  3 +-
 .../types/ProductCollection.java                |  3 +-
 .../odatawcfservice/types/ProductDetail.java    |  3 +-
 .../types/ProductDetailCollection.java          |  6 +-
 .../odatawcfservice/types/ProductDetailKey.java |  1 -
 .../odatawcfservice/types/ProductReview.java    |  6 +-
 .../types/ProductReviewCollection.java          |  6 +-
 .../odatawcfservice/types/ProductReviewKey.java |  1 -
 .../odatawcfservice/types/PublicCompany.java    |  3 +-
 .../types/PublicCompanyCollection.java          |  6 +-
 .../odatawcfservice/types/Statement.java        |  6 +-
 .../types/StatementCollection.java              |  6 +-
 .../odatawcfservice/types/StoredPI.java         |  6 +-
 .../types/StoredPICollection.java               |  6 +-
 .../odatawcfservice/types/Subscription.java     |  6 +-
 .../types/SubscriptionCollection.java           |  6 +-
 .../odatawcfservice/types/package-info.java     |  1 -
 .../invoke/AbstractODataInvokeRequest.java      |  7 +-
 .../invoke/v3/ODataInvokeRequestImpl.java       | 20 +----
 .../invoke/v4/ODataInvokeRequestImpl.java       | 43 +--------
 .../apache/olingo/client/core/uri/URIUtils.java | 95 ++++++++++++++++----
 .../org/apache/olingo/server/api/OData.java     | 18 ++--
 .../server/api/ODataTranslatedException.java    | 34 ++++---
 .../server/api/edm/provider/EdmProvider.java    | 11 ++-
 .../server/api/processor/DefaultProcessor.java  |  5 +-
 .../serializer/ODataSerializerException.java    | 29 +++---
 .../src/main/resources/i18n.properties          |  8 +-
 .../server/api/TranslatedExceptionsTest.java    | 24 ++---
 .../src/test/resources/i18n_de.properties       | 28 +++---
 .../src/test/resources/i18n_en.properties       | 32 +++----
 .../olingo/server/core/ContentNegotiator.java   | 17 ++--
 .../server/core/ODataExceptionHandler.java      |  2 +-
 .../apache/olingo/server/core/ODataHandler.java | 36 ++++----
 .../server/core/ODataHttpHandlerImpl.java       | 17 ++--
 .../apache/olingo/server/core/ODataImpl.java    |  7 +-
 .../core/serializer/ODataXmlSerializerImpl.java | 14 +--
 .../serializer/json/ODataErrorSerializer.java   |  8 +-
 .../serializer/json/ODataJsonSerializer.java    | 42 +++++----
 .../server/core/ContentNegotiatorTest.java      | 12 +--
 .../json/ODataErrorSerializerTest.java          |  6 +-
 .../tecsvc/processor/TechnicalProcessor.java    | 25 +++---
 .../json/ODataJsonSerializerTest.java           |  2 +-
 458 files changed, 2471 insertions(+), 846 deletions(-)
----------------------------------------------------------------------