[OLINGO-649] Cleanup code as release preperation
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/d1507449 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d1507449 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d1507449 Branch: refs/heads/master Commit: d150744967144624986629b1680e9ac6124958f0 Parents: f5757cb Author: Christian Amend <[email protected]> Authored: Tue May 5 14:25:29 2015 +0200 Committer: Christian Amend <[email protected]> Committed: Tue May 5 14:25:29 2015 +0200 ---------------------------------------------------------------------- .../org/apache/olingo/fit/AbstractServices.java | 61 +- .../fit/UnsupportedMediaTypeException.java | 4 +- .../main/java/org/apache/olingo/fit/V4Demo.java | 33 +- .../org/apache/olingo/fit/V4KeyAsSegment.java | 103 +- .../java/org/apache/olingo/fit/V4NorthWind.java | 13 +- .../org/apache/olingo/fit/V4NorthWindExt.java | 15 +- .../java/org/apache/olingo/fit/V4OAuth2.java | 10 +- .../java/org/apache/olingo/fit/V4OpenType.java | 31 +- .../java/org/apache/olingo/fit/V4Services.java | 5 +- .../org/apache/olingo/fit/V4Vocabularies.java | 8 +- .../fit/metadata/AbstractMetadataElement.java | 4 +- .../apache/olingo/fit/metadata/Association.java | 4 +- .../olingo/fit/metadata/AssociationSet.java | 4 +- .../apache/olingo/fit/metadata/Container.java | 4 +- .../apache/olingo/fit/metadata/EntitySet.java | 4 +- .../apache/olingo/fit/metadata/EntityType.java | 4 +- .../apache/olingo/fit/metadata/Metadata.java | 51 +- .../olingo/fit/metadata/NavigationProperty.java | 4 +- .../apache/olingo/fit/metadata/Property.java | 4 +- .../org/apache/olingo/fit/metadata/Schema.java | 4 +- .../org/apache/olingo/fit/methods/MERGE.java | 9 +- .../org/apache/olingo/fit/methods/PATCH.java | 9 +- .../apache/olingo/fit/rest/OAuth2Provider.java | 54 +- .../olingo/fit/rest/OAuth2RequestFilter.java | 17 +- .../rest/ResolvingReferencesInterceptor.java | 14 +- .../fit/rest/ServiceNameResponseFilter.java | 25 +- .../fit/rest/StaticSecurityInterceptor.java | 31 +- .../olingo/fit/rest/XHTTPMethodInterceptor.java | 12 +- .../apache/olingo/fit/rproxy/LinkRewrite.java | 8 +- .../olingo/fit/rproxy/LinkRewriteRenderer.java | 12 +- .../fit/serializer/FITAtomDeserializer.java | 4 +- .../olingo/fit/server/TomcatTestServer.java | 69 +- .../olingo/fit/utils/AbstractUtilities.java | 38 +- .../org/apache/olingo/fit/utils/Accept.java | 4 +- .../org/apache/olingo/fit/utils/Commons.java | 43 +- .../apache/olingo/fit/utils/ConstantKey.java | 4 +- .../org/apache/olingo/fit/utils/Constants.java | 4 +- .../org/apache/olingo/fit/utils/FSManager.java | 27 +- .../fit/utils/InjectableSerializerProvider.java | 4 +- .../apache/olingo/fit/utils/JSONUtilities.java | 18 +- .../org/apache/olingo/fit/utils/LinkInfo.java | 4 +- .../olingo/fit/utils/MetadataLinkInfo.java | 7 +- .../olingo/fit/utils/NavigationLinks.java | 8 +- .../org/apache/olingo/fit/utils/XMLElement.java | 4 +- .../olingo/fit/utils/XMLEventReaderWrapper.java | 20 +- .../olingo/fit/AbstractBaseTestITCase.java | 29 +- .../olingo/fit/CXFOAuth2HttpClientFactory.java | 44 +- .../fit/proxy/v4/APIBasicDesignTestITCase.java | 18 +- .../olingo/fit/proxy/v4/AbstractTestITCase.java | 20 +- .../olingo/fit/proxy/v4/AsyncTestITCase.java | 37 +- .../proxy/v4/AuthEntityCreateTestITCase.java | 18 +- .../proxy/v4/AuthEntityRetrieveTestITCase.java | 18 +- .../v4/BoundOperationInvokeTestITCase.java | 40 +- .../olingo/fit/proxy/v4/ContextTestITCase.java | 18 +- .../fit/proxy/v4/DerivedTypeTestITCase.java | 25 +- .../fit/proxy/v4/EntityCreateTestITCase.java | 58 +- .../fit/proxy/v4/EntityRetrieveTestITCase.java | 27 +- .../fit/proxy/v4/EntitySetTestITCase.java | 16 +- .../fit/proxy/v4/EntityUpdateTestITCase.java | 45 +- .../olingo/fit/proxy/v4/FilterTestITCase.java | 41 +- .../fit/proxy/v4/KeyAsSegmentTestITCase.java | 16 +- .../fit/proxy/v4/MediaEntityTestITCase.java | 20 +- ...TransactionalAuthEntityCreateTestITCase.java | 18 +- .../NonTransactionalEntityCreateTestITCase.java | 16 +- .../NonTransactionalEntityUpdateTestITCase.java | 16 +- .../NonTransactionalMediaEntityTestITCase.java | 16 +- .../olingo/fit/proxy/v4/OpenTypeTestITCase.java | 28 +- .../v4/OperationImportInvokeTestITCase.java | 27 +- .../olingo/fit/proxy/v4/PropertyTestITCase.java | 16 +- .../fit/proxy/v4/SingletonTestITCase.java | 16 +- .../v4/UnauthorizedEntityCreateTestITCase.java | 18 +- .../olingo/fit/proxy/v4/demo/Service.java | 44 +- .../proxy/v4/demo/odatademo/Advertisements.java | 40 +- .../fit/proxy/v4/demo/odatademo/Categories.java | 40 +- .../proxy/v4/demo/odatademo/DemoService.java | 65 +- .../proxy/v4/demo/odatademo/PersonDetails.java | 40 +- .../fit/proxy/v4/demo/odatademo/Persons.java | 40 +- .../proxy/v4/demo/odatademo/ProductDetails.java | 40 +- .../fit/proxy/v4/demo/odatademo/Products.java | 40 +- .../fit/proxy/v4/demo/odatademo/Suppliers.java | 40 +- .../proxy/v4/demo/odatademo/package-info.java | 16 +- .../proxy/v4/demo/odatademo/types/Address.java | 260 +- .../demo/odatademo/types/AddressCollection.java | 36 +- .../AddressCollectionComposableInvoker.java | 22 +- .../types/AddressComposableInvoker.java | 187 +- .../v4/demo/odatademo/types/Advertisement.java | 217 +- .../types/AdvertisementCollection.java | 36 +- ...dvertisementCollectionComposableInvoker.java | 22 +- .../types/AdvertisementComposableInvoker.java | 152 +- .../proxy/v4/demo/odatademo/types/Category.java | 174 +- .../odatademo/types/CategoryCollection.java | 36 +- .../CategoryCollectionComposableInvoker.java | 22 +- .../types/CategoryComposableInvoker.java | 106 +- .../proxy/v4/demo/odatademo/types/Customer.java | 218 +- .../odatademo/types/CustomerCollection.java | 36 +- .../CustomerCollectionComposableInvoker.java | 22 +- .../types/CustomerComposableInvoker.java | 133 +- .../proxy/v4/demo/odatademo/types/Employee.java | 300 +- .../odatademo/types/EmployeeCollection.java | 36 +- .../EmployeeCollectionComposableInvoker.java | 22 +- .../types/EmployeeComposableInvoker.java | 207 +- .../demo/odatademo/types/FeaturedProduct.java | 483 +- .../types/FeaturedProductCollection.java | 36 +- ...turedProductCollectionComposableInvoker.java | 22 +- .../types/FeaturedProductComposableInvoker.java | 329 +- .../proxy/v4/demo/odatademo/types/Person.java | 170 +- .../demo/odatademo/types/PersonCollection.java | 36 +- .../PersonCollectionComposableInvoker.java | 22 +- .../types/PersonComposableInvoker.java | 104 +- .../v4/demo/odatademo/types/PersonDetail.java | 327 +- .../odatademo/types/PersonDetailCollection.java | 36 +- ...PersonDetailCollectionComposableInvoker.java | 22 +- .../types/PersonDetailComposableInvoker.java | 238 +- .../proxy/v4/demo/odatademo/types/Product.java | 440 +- .../demo/odatademo/types/ProductCollection.java | 36 +- .../ProductCollectionComposableInvoker.java | 22 +- .../types/ProductComposableInvoker.java | 309 +- .../v4/demo/odatademo/types/ProductDetail.java | 171 +- .../types/ProductDetailCollection.java | 36 +- ...roductDetailCollectionComposableInvoker.java | 22 +- .../types/ProductDetailComposableInvoker.java | 104 +- .../proxy/v4/demo/odatademo/types/Supplier.java | 287 +- .../odatademo/types/SupplierCollection.java | 36 +- .../SupplierCollectionComposableInvoker.java | 22 +- .../types/SupplierComposableInvoker.java | 207 +- .../v4/demo/odatademo/types/package-info.java | 16 +- .../olingo/fit/proxy/v4/opentype/Service.java | 22 +- .../opentypesservicev4/DefaultContainer.java | 43 +- .../odata/services/opentypesservicev4/Row.java | 43 +- .../services/opentypesservicev4/RowIndex.java | 43 +- .../opentypesservicev4/package-info.java | 16 +- .../opentypesservicev4/types/AccountInfo.java | 140 +- .../types/AccountInfoCollection.java | 36 +- .../AccountInfoCollectionComposableInvoker.java | 22 +- .../types/AccountInfoComposableInvoker.java | 92 +- .../opentypesservicev4/types/Color.java | 46 +- .../types/ContactDetails.java | 540 +- .../types/ContactDetailsCollection.java | 36 +- ...ntactDetailsCollectionComposableInvoker.java | 22 +- .../types/ContactDetailsComposableInvoker.java | 411 +- .../opentypesservicev4/types/IndexedRow.java | 102 +- .../types/IndexedRowCollection.java | 36 +- .../IndexedRowCollectionComposableInvoker.java | 22 +- .../types/IndexedRowComposableInvoker.java | 65 +- .../services/opentypesservicev4/types/Row.java | 92 +- .../opentypesservicev4/types/RowCollection.java | 36 +- .../types/RowCollectionComposableInvoker.java | 22 +- .../types/RowComposableInvoker.java | 65 +- .../opentypesservicev4/types/RowIndex.java | 136 +- .../types/RowIndexCollection.java | 36 +- .../RowIndexCollectionComposableInvoker.java | 22 +- .../types/RowIndexComposableInvoker.java | 80 +- .../opentypesservicev4/types/package-info.java | 16 +- .../fit/proxy/v4/staticservice/Service.java | 124 +- .../services/odatawcfservice/Accounts.java | 43 +- .../services/odatawcfservice/Customers.java | 43 +- .../services/odatawcfservice/Departments.java | 43 +- .../services/odatawcfservice/Employees.java | 43 +- .../odatawcfservice/InMemoryEntities.java | 283 +- .../services/odatawcfservice/OrderDetails.java | 46 +- .../odata/services/odatawcfservice/Orders.java | 43 +- .../odata/services/odatawcfservice/People.java | 43 +- .../odatawcfservice/ProductDetails.java | 46 +- .../odatawcfservice/ProductReviews.java | 46 +- .../services/odatawcfservice/Products.java | 43 +- .../services/odatawcfservice/StoredPIs.java | 43 +- .../odatawcfservice/SubscriptionTemplates.java | 43 +- .../services/odatawcfservice/package-info.java | 16 +- .../odatawcfservice/types/AccessLevel.java | 50 +- .../services/odatawcfservice/types/Account.java | 404 +- .../types/AccountCollection.java | 36 +- .../AccountCollectionComposableInvoker.java | 22 +- .../types/AccountComposableInvoker.java | 258 +- .../odatawcfservice/types/AccountInfo.java | 138 +- .../types/AccountInfoCollection.java | 36 +- .../AccountInfoCollectionComposableInvoker.java | 22 +- .../types/AccountInfoComposableInvoker.java | 92 +- .../services/odatawcfservice/types/Address.java | 180 +- .../types/AddressCollection.java | 36 +- .../AddressCollectionComposableInvoker.java | 22 +- .../types/AddressComposableInvoker.java | 123 +- .../services/odatawcfservice/types/Asset.java | 182 +- .../odatawcfservice/types/AssetCollection.java | 36 +- .../types/AssetCollectionComposableInvoker.java | 22 +- .../types/AssetComposableInvoker.java | 115 +- .../services/odatawcfservice/types/Club.java | 143 +- .../odatawcfservice/types/ClubCollection.java | 36 +- .../types/ClubCollectionComposableInvoker.java | 22 +- .../types/ClubComposableInvoker.java | 88 +- .../services/odatawcfservice/types/Color.java | 46 +- .../services/odatawcfservice/types/Company.java | 424 +- .../odatawcfservice/types/CompanyAddress.java | 233 +- .../types/CompanyAddressCollection.java | 36 +- ...mpanyAddressCollectionComposableInvoker.java | 22 +- .../types/CompanyAddressComposableInvoker.java | 155 +- .../odatawcfservice/types/CompanyCategory.java | 48 +- .../types/CompanyCollection.java | 36 +- .../CompanyCollectionComposableInvoker.java | 22 +- .../types/CompanyComposableInvoker.java | 286 +- .../odatawcfservice/types/CreditCardPI.java | 523 +- .../types/CreditCardPICollection.java | 36 +- ...CreditCardPICollectionComposableInvoker.java | 22 +- .../types/CreditCardPIComposableInvoker.java | 371 +- .../odatawcfservice/types/CreditRecord.java | 222 +- .../types/CreditRecordCollection.java | 36 +- ...CreditRecordCollectionComposableInvoker.java | 22 +- .../types/CreditRecordComposableInvoker.java | 144 +- .../odatawcfservice/types/Customer.java | 621 +- .../types/CustomerCollection.java | 36 +- .../CustomerCollectionComposableInvoker.java | 22 +- .../types/CustomerComposableInvoker.java | 442 +- .../odatawcfservice/types/Department.java | 211 +- .../types/DepartmentCollection.java | 36 +- .../DepartmentCollectionComposableInvoker.java | 22 +- .../types/DepartmentComposableInvoker.java | 135 +- .../odatawcfservice/types/Employee.java | 551 +- .../types/EmployeeCollection.java | 36 +- .../EmployeeCollectionComposableInvoker.java | 22 +- .../types/EmployeeComposableInvoker.java | 388 +- .../odatawcfservice/types/GiftCard.java | 280 +- .../types/GiftCardCollection.java | 36 +- .../GiftCardCollectionComposableInvoker.java | 22 +- .../types/GiftCardComposableInvoker.java | 185 +- .../odatawcfservice/types/HomeAddress.java | 233 +- .../types/HomeAddressCollection.java | 36 +- .../HomeAddressCollectionComposableInvoker.java | 22 +- .../types/HomeAddressComposableInvoker.java | 155 +- .../services/odatawcfservice/types/IsBoss.java | 25 +- .../odatawcfservice/types/LabourUnion.java | 144 +- .../types/LabourUnionCollection.java | 36 +- .../LabourUnionCollectionComposableInvoker.java | 22 +- .../types/LabourUnionComposableInvoker.java | 88 +- .../services/odatawcfservice/types/Order.java | 313 +- .../odatawcfservice/types/OrderCollection.java | 36 +- .../types/OrderCollectionComposableInvoker.java | 22 +- .../types/OrderComposableInvoker.java | 225 +- .../odatawcfservice/types/OrderDetail.java | 324 +- .../types/OrderDetailCollection.java | 36 +- .../OrderDetailCollectionComposableInvoker.java | 22 +- .../types/OrderDetailComposableInvoker.java | 234 +- .../odatawcfservice/types/OrderDetailKey.java | 53 +- .../types/PaymentInstrument.java | 297 +- .../types/PaymentInstrumentCollection.java | 36 +- ...ntInstrumentCollectionComposableInvoker.java | 22 +- .../PaymentInstrumentComposableInvoker.java | 216 +- .../services/odatawcfservice/types/Person.java | 450 +- .../odatawcfservice/types/PersonCollection.java | 36 +- .../PersonCollectionComposableInvoker.java | 22 +- .../types/PersonComposableInvoker.java | 304 +- .../services/odatawcfservice/types/Product.java | 496 +- .../types/ProductCollection.java | 54 +- .../ProductCollectionComposableInvoker.java | 22 +- .../types/ProductComposableInvoker.java | 342 +- .../odatawcfservice/types/ProductDetail.java | 305 +- .../types/ProductDetailCollection.java | 36 +- ...roductDetailCollectionComposableInvoker.java | 22 +- .../types/ProductDetailComposableInvoker.java | 203 +- .../odatawcfservice/types/ProductDetailKey.java | 53 +- .../odatawcfservice/types/ProductReview.java | 304 +- .../types/ProductReviewCollection.java | 36 +- ...roductReviewCollectionComposableInvoker.java | 22 +- .../types/ProductReviewComposableInvoker.java | 219 +- .../odatawcfservice/types/ProductReviewKey.java | 85 +- .../odatawcfservice/types/PublicCompany.java | 577 +- .../types/PublicCompanyCollection.java | 36 +- ...ublicCompanyCollectionComposableInvoker.java | 22 +- .../types/PublicCompanyComposableInvoker.java | 405 +- .../odatawcfservice/types/Statement.java | 221 +- .../types/StatementCollection.java | 36 +- .../StatementCollectionComposableInvoker.java | 22 +- .../types/StatementComposableInvoker.java | 144 +- .../odatawcfservice/types/StoredPI.java | 221 +- .../types/StoredPICollection.java | 36 +- .../StoredPICollectionComposableInvoker.java | 22 +- .../types/StoredPIComposableInvoker.java | 144 +- .../odatawcfservice/types/Subscription.java | 261 +- .../types/SubscriptionCollection.java | 36 +- ...SubscriptionCollectionComposableInvoker.java | 22 +- .../types/SubscriptionComposableInvoker.java | 185 +- .../odatawcfservice/types/package-info.java | 16 +- .../apache/olingo/fit/tecsvc/TecSvcConst.java | 18 +- .../fit/tecsvc/client/ActionImportITCase.java | 46 +- .../BasicHttpExceptionHandlingITCase.java | 4 +- .../olingo/fit/tecsvc/client/BasicITCase.java | 162 +- .../fit/tecsvc/client/BatchClientITCase.java | 17 +- .../olingo/fit/tecsvc/client/BindingITCase.java | 89 +- .../fit/tecsvc/client/DeepInsertITCase.java | 264 +- .../fit/tecsvc/client/ExpandSelectITCase.java | 6 +- .../ExpandWithSystemQueryOptionsITCase.java | 10 +- .../tecsvc/client/FilterSystemQueryITCase.java | 66 +- .../fit/tecsvc/client/FunctionImportITCase.java | 6 +- .../olingo/fit/tecsvc/client/MediaITCase.java | 10 +- .../fit/tecsvc/client/NavigationITCase.java | 34 +- .../tecsvc/client/OrderBySystemQueryITCase.java | 16 +- .../tecsvc/client/PrimitiveComplexITCase.java | 6 +- .../tecsvc/client/SystemQueryOptionITCase.java | 22 +- .../fit/tecsvc/http/BasicBatchITCase.java | 43 +- .../olingo/fit/tecsvc/http/BasicHttpITCase.java | 28 +- .../olingo/fit/tecsvc/http/PingITCase.java | 18 +- .../olingo/fit/v4/AbstractTestITCase.java | 40 +- .../apache/olingo/fit/v4/AsyncTestITCase.java | 28 +- .../olingo/fit/v4/AuthBatchTestITCase.java | 14 +- .../apache/olingo/fit/v4/BatchTestITCase.java | 62 +- .../fit/v4/BoundOperationInvokeTestITCase.java | 34 +- .../olingo/fit/v4/ConformanceTestITCase.java | 28 +- .../apache/olingo/fit/v4/DeltaTestITCase.java | 12 +- .../olingo/fit/v4/DerivedTypeTestITCase.java | 10 +- .../olingo/fit/v4/EntityCreateTestITCase.java | 24 +- .../olingo/fit/v4/EntityRetrieveTestITCase.java | 20 +- .../olingo/fit/v4/EntitySetTestITCase.java | 22 +- .../olingo/fit/v4/EntityUpdateTestITCase.java | 20 +- .../olingo/fit/v4/ErrorResponseTestITCase.java | 16 +- .../olingo/fit/v4/FilterFactoryTestITCase.java | 12 +- .../fit/v4/JSONFormatConformanceTestITCase.java | 16 +- .../olingo/fit/v4/KeyAsSegmentTestITCase.java | 18 +- .../olingo/fit/v4/MediaEntityTestITCase.java | 32 +- .../olingo/fit/v4/MetadataTestITCase.java | 12 +- .../apache/olingo/fit/v4/OAuth2TestITCase.java | 15 +- .../olingo/fit/v4/OpenTypeTestITCase.java | 28 +- .../fit/v4/OperationImportInvokeTestITCase.java | 8 +- .../olingo/fit/v4/PropertyTestITCase.java | 6 +- .../olingo/fit/v4/PropertyValueTestITCase.java | 6 +- .../olingo/fit/v4/QueryOptionsTestITCase.java | 28 +- .../fit/v4/ServiceDocumentTestITCase.java | 12 +- .../olingo/fit/v4/SingletonTestITCase.java | 20 +- .../apache/olingo/commons/api/Constants.java | 25 +- .../apache/olingo/commons/api/ODataError.java | 22 +- .../olingo/commons/api/ODataErrorDetail.java | 10 +- .../olingo/commons/api/ODataException.java | 4 +- .../olingo/commons/api/ODataPropertyType.java | 4 +- .../commons/api/ODataRuntimeException.java | 4 +- .../commons/api/data/AbstractODataObject.java | 9 +- .../olingo/commons/api/data/Annotatable.java | 4 +- .../olingo/commons/api/data/Annotation.java | 4 +- .../olingo/commons/api/data/ComplexValue.java | 4 +- .../olingo/commons/api/data/ContextURL.java | 30 +- .../olingo/commons/api/data/DeletedEntity.java | 4 +- .../apache/olingo/commons/api/data/Delta.java | 4 +- .../olingo/commons/api/data/DeltaLink.java | 4 +- .../apache/olingo/commons/api/data/Entity.java | 44 +- .../commons/api/data/EntityCollection.java | 18 +- .../olingo/commons/api/data/GeoUtils.java | 18 +- .../apache/olingo/commons/api/data/Link.java | 37 +- .../apache/olingo/commons/api/data/Linked.java | 16 +- .../olingo/commons/api/data/Operation.java | 16 +- .../olingo/commons/api/data/Parameter.java | 6 +- .../olingo/commons/api/data/Property.java | 6 +- .../apache/olingo/commons/api/data/ResWrap.java | 12 +- .../olingo/commons/api/data/Valuable.java | 24 +- .../olingo/commons/api/data/ValueType.java | 4 +- .../olingo/commons/api/data/package-info.java | 4 +- .../org/apache/olingo/commons/api/edm/Edm.java | 40 +- .../olingo/commons/api/edm/EdmAction.java | 6 +- .../olingo/commons/api/edm/EdmActionImport.java | 6 +- .../commons/api/edm/EdmActionImportInfo.java | 6 +- .../olingo/commons/api/edm/EdmAnnotatable.java | 4 +- .../olingo/commons/api/edm/EdmAnnotation.java | 4 +- .../olingo/commons/api/edm/EdmAnnotations.java | 4 +- .../commons/api/edm/EdmAnnotationsTarget.java | 8 +- .../commons/api/edm/EdmBindingTarget.java | 10 +- .../olingo/commons/api/edm/EdmComplexType.java | 4 +- .../olingo/commons/api/edm/EdmElement.java | 6 +- .../commons/api/edm/EdmEntityContainer.java | 22 +- .../olingo/commons/api/edm/EdmEntitySet.java | 4 +- .../olingo/commons/api/edm/EdmEntityType.java | 14 +- .../olingo/commons/api/edm/EdmEnumType.java | 4 +- .../olingo/commons/api/edm/EdmException.java | 4 +- .../olingo/commons/api/edm/EdmFunction.java | 4 +- .../commons/api/edm/EdmFunctionImport.java | 8 +- .../commons/api/edm/EdmKeyPropertyRef.java | 4 +- .../olingo/commons/api/edm/EdmMappable.java | 6 +- .../olingo/commons/api/edm/EdmMapping.java | 4 +- .../olingo/commons/api/edm/EdmMember.java | 4 +- .../apache/olingo/commons/api/edm/EdmNamed.java | 4 +- .../commons/api/edm/EdmNavigationProperty.java | 4 +- .../api/edm/EdmNavigationPropertyBinding.java | 4 +- .../olingo/commons/api/edm/EdmOperation.java | 6 +- .../commons/api/edm/EdmOperationImport.java | 4 +- .../commons/api/edm/EdmOperationImportInfo.java | 4 +- .../olingo/commons/api/edm/EdmParameter.java | 4 +- .../commons/api/edm/EdmPrimitiveType.java | 20 +- .../api/edm/EdmPrimitiveTypeException.java | 4 +- .../commons/api/edm/EdmPrimitiveTypeKind.java | 20 +- .../olingo/commons/api/edm/EdmProperty.java | 8 +- .../api/edm/EdmReferentialConstraint.java | 4 +- .../olingo/commons/api/edm/EdmReturnType.java | 4 +- .../olingo/commons/api/edm/EdmSchema.java | 4 +- .../olingo/commons/api/edm/EdmSingleton.java | 6 +- .../commons/api/edm/EdmStructuredType.java | 24 +- .../apache/olingo/commons/api/edm/EdmTerm.java | 10 +- .../apache/olingo/commons/api/edm/EdmType.java | 6 +- .../commons/api/edm/EdmTypeDefinition.java | 4 +- .../apache/olingo/commons/api/edm/EdmTyped.java | 6 +- .../commons/api/edm/FullQualifiedName.java | 6 +- .../commons/api/edm/annotation/EdmAnd.java | 6 +- .../edm/annotation/EdmAnnotationExpression.java | 4 +- .../api/edm/annotation/EdmAnnotationPath.java | 4 +- .../commons/api/edm/annotation/EdmApply.java | 10 +- .../commons/api/edm/annotation/EdmCast.java | 4 +- .../api/edm/annotation/EdmCollection.java | 4 +- .../EdmConstantAnnotationExpression.java | 4 +- .../EdmDynamicAnnotationExpression.java | 4 +- .../commons/api/edm/annotation/EdmEq.java | 6 +- .../commons/api/edm/annotation/EdmGe.java | 6 +- .../commons/api/edm/annotation/EdmGt.java | 6 +- .../commons/api/edm/annotation/EdmIf.java | 4 +- .../commons/api/edm/annotation/EdmIsOf.java | 4 +- .../api/edm/annotation/EdmLabeledElement.java | 4 +- .../annotation/EdmLabeledElementReference.java | 4 +- .../commons/api/edm/annotation/EdmLe.java | 6 +- .../commons/api/edm/annotation/EdmLt.java | 6 +- .../annotation/EdmNavigationPropertyPath.java | 4 +- .../commons/api/edm/annotation/EdmNe.java | 6 +- .../commons/api/edm/annotation/EdmNot.java | 4 +- .../commons/api/edm/annotation/EdmNull.java | 6 +- .../commons/api/edm/annotation/EdmOr.java | 6 +- .../commons/api/edm/annotation/EdmPath.java | 4 +- .../api/edm/annotation/EdmPropertyPath.java | 4 +- .../api/edm/annotation/EdmPropertyValue.java | 4 +- .../commons/api/edm/annotation/EdmRecord.java | 8 +- ...mTwoParamsOpDynamicAnnotationExpression.java | 4 +- .../commons/api/edm/annotation/EdmUrlRef.java | 4 +- .../api/edm/constants/EdmContentKind.java | 4 +- .../commons/api/edm/constants/EdmOnDelete.java | 4 +- .../commons/api/edm/constants/EdmTypeKind.java | 4 +- .../api/edm/constants/ODataServiceVersion.java | 8 +- .../commons/api/edm/geo/ComposedGeospatial.java | 6 +- .../olingo/commons/api/edm/geo/Geospatial.java | 20 +- .../api/edm/geo/GeospatialCollection.java | 10 +- .../olingo/commons/api/edm/geo/LineString.java | 10 +- .../commons/api/edm/geo/MultiLineString.java | 10 +- .../olingo/commons/api/edm/geo/MultiPoint.java | 10 +- .../commons/api/edm/geo/MultiPolygon.java | 10 +- .../olingo/commons/api/edm/geo/Point.java | 6 +- .../olingo/commons/api/edm/geo/Polygon.java | 14 +- .../apache/olingo/commons/api/edm/geo/SRID.java | 17 +- .../olingo/commons/api/edm/package-info.java | 4 +- .../api/edm/provider/CsdlAbstractEdmItem.java | 14 +- .../edm/provider/CsdlAbstractEdmProvider.java | 10 +- .../commons/api/edm/provider/CsdlAction.java | 4 +- .../api/edm/provider/CsdlActionImport.java | 9 +- .../commons/api/edm/provider/CsdlAliasInfo.java | 4 +- .../api/edm/provider/CsdlAnnotatable.java | 16 +- .../api/edm/provider/CsdlAnnotation.java | 10 +- .../api/edm/provider/CsdlAnnotations.java | 16 +- .../api/edm/provider/CsdlBindingTarget.java | 17 +- .../api/edm/provider/CsdlComplexType.java | 6 +- .../api/edm/provider/CsdlEdmProvider.java | 32 +- .../api/edm/provider/CsdlEntityContainer.java | 5 +- .../edm/provider/CsdlEntityContainerInfo.java | 4 +- .../commons/api/edm/provider/CsdlEntitySet.java | 12 +- .../api/edm/provider/CsdlEntitySetPath.java | 4 +- .../api/edm/provider/CsdlEntityType.java | 8 +- .../api/edm/provider/CsdlEnumMember.java | 9 +- .../commons/api/edm/provider/CsdlEnumType.java | 14 +- .../api/edm/provider/CsdlExpression.java | 6 +- .../commons/api/edm/provider/CsdlFunction.java | 6 +- .../api/edm/provider/CsdlFunctionImport.java | 12 +- .../commons/api/edm/provider/CsdlMapping.java | 10 +- .../commons/api/edm/provider/CsdlNamed.java | 14 +- .../edm/provider/CsdlNavigationProperty.java | 17 +- .../provider/CsdlNavigationPropertyBinding.java | 5 +- .../commons/api/edm/provider/CsdlOnDelete.java | 18 +- .../api/edm/provider/CsdlOnDeleteAction.java | 14 +- .../commons/api/edm/provider/CsdlOperation.java | 14 +- .../api/edm/provider/CsdlOperationImport.java | 7 +- .../commons/api/edm/provider/CsdlParameter.java | 13 +- .../commons/api/edm/provider/CsdlProperty.java | 24 +- .../api/edm/provider/CsdlPropertyRef.java | 5 +- .../edm/provider/CsdlReferentialConstraint.java | 6 +- .../api/edm/provider/CsdlReturnType.java | 10 +- .../commons/api/edm/provider/CsdlSchema.java | 33 +- .../commons/api/edm/provider/CsdlSingleton.java | 8 +- .../api/edm/provider/CsdlStructuralType.java | 9 +- .../commons/api/edm/provider/CsdlTerm.java | 10 +- .../api/edm/provider/CsdlTypeDefinition.java | 9 +- .../annotation/AnnotationExpression.java | 14 +- .../edm/provider/annotation/AnnotationPath.java | 14 +- .../api/edm/provider/annotation/Apply.java | 14 +- .../api/edm/provider/annotation/Cast.java | 14 +- .../api/edm/provider/annotation/Collection.java | 14 +- .../ConstantAnnotationExpression.java | 14 +- .../annotation/DynamicAnnotationExpression.java | 18 +- .../commons/api/edm/provider/annotation/If.java | 14 +- .../api/edm/provider/annotation/IsOf.java | 14 +- .../edm/provider/annotation/LabeledElement.java | 14 +- .../annotation/LabeledElementReference.java | 14 +- .../annotation/NavigationPropertyPath.java | 14 +- .../api/edm/provider/annotation/Not.java | 14 +- .../api/edm/provider/annotation/Null.java | 16 +- .../api/edm/provider/annotation/Path.java | 14 +- .../edm/provider/annotation/PropertyPath.java | 14 +- .../edm/provider/annotation/PropertyValue.java | 14 +- .../api/edm/provider/annotation/Record.java | 14 +- .../TwoParamsOpDynamicAnnotationExpression.java | 16 +- .../api/edm/provider/annotation/UrlRef.java | 14 +- .../commons/api/edm/provider/package-info.java | 4 +- .../olingo/commons/api/format/AcceptType.java | 48 +- .../olingo/commons/api/format/ContentType.java | 24 +- .../olingo/commons/api/format/ODataFormat.java | 13 +- .../olingo/commons/api/format/TypeUtil.java | 10 +- .../commons/api/http/HttpContentType.java | 6 +- .../olingo/commons/api/http/HttpHeader.java | 10 +- .../olingo/commons/api/http/HttpMethod.java | 4 +- .../olingo/commons/api/http/HttpStatusCode.java | 28 +- .../api/serialization/ODataDeserializer.java | 18 +- .../ODataDeserializerException.java | 4 +- .../api/serialization/ODataSerializer.java | 8 +- .../serialization/ODataSerializerException.java | 4 +- .../commons/api/format/AcceptTypeTest.java | 14 +- .../commons/api/format/ContentTypeTest.java | 8 +- .../org/apache/olingo/commons/core/Decoder.java | 6 +- .../org/apache/olingo/commons/core/Encoder.java | 38 +- .../olingo/commons/core/edm/AbstractEdm.java | 67 +- .../core/edm/AbstractEdmAnnotatable.java | 14 +- .../core/edm/AbstractEdmBindingTarget.java | 12 +- .../commons/core/edm/AbstractEdmNamed.java | 4 +- .../commons/core/edm/AbstractEdmOperation.java | 10 +- .../core/edm/AbstractEdmOperationImport.java | 8 +- .../core/edm/AbstractEdmStructuredType.java | 42 +- .../olingo/commons/core/edm/ActionMapKey.java | 4 +- .../olingo/commons/core/edm/EdmActionImpl.java | 4 +- .../commons/core/edm/EdmActionImportImpl.java | 4 +- .../commons/core/edm/EdmAnnotationImpl.java | 130 +- .../commons/core/edm/EdmAnnotationsImpl.java | 20 +- .../commons/core/edm/EdmComplexTypeImpl.java | 4 +- .../core/edm/EdmEntityContainerImpl.java | 28 +- .../commons/core/edm/EdmEntitySetImpl.java | 4 +- .../commons/core/edm/EdmEntityTypeImpl.java | 6 +- .../commons/core/edm/EdmEnumTypeImpl.java | 14 +- .../commons/core/edm/EdmFunctionImpl.java | 4 +- .../commons/core/edm/EdmFunctionImportImpl.java | 6 +- .../commons/core/edm/EdmKeyPropertyRefImpl.java | 6 +- .../olingo/commons/core/edm/EdmMemberImpl.java | 6 +- .../edm/EdmNavigationPropertyBindingImpl.java | 4 +- .../core/edm/EdmNavigationPropertyImpl.java | 6 +- .../commons/core/edm/EdmParameterImpl.java | 6 +- .../commons/core/edm/EdmPropertyImpl.java | 8 +- .../commons/core/edm/EdmProviderImpl.java | 80 +- .../core/edm/EdmReferentialConstraintImpl.java | 6 +- .../commons/core/edm/EdmReturnTypeImpl.java | 10 +- .../olingo/commons/core/edm/EdmSchemaImpl.java | 8 +- .../commons/core/edm/EdmSingletonImpl.java | 4 +- .../olingo/commons/core/edm/EdmTermImpl.java | 40 +- .../commons/core/edm/EdmTypeDefinitionImpl.java | 15 +- .../olingo/commons/core/edm/EdmTypeImpl.java | 6 +- .../olingo/commons/core/edm/EdmTypeInfo.java | 18 +- .../olingo/commons/core/edm/FunctionMapKey.java | 10 +- .../apache/olingo/commons/core/edm/Target.java | 6 +- ...mAnnotatableDynamicAnnotationExpression.java | 12 +- .../AbstractEdmAnnotationEspression.java | 4 +- .../AbstractEdmDynamicAnnotationExpression.java | 6 +- .../AbstractEdmElementOrAttributeNotation.java | 4 +- ...mTwoParamsOpDynamicAnnotationExpression.java | 6 +- .../commons/core/edm/annotation/EdmAndImpl.java | 4 +- .../edm/annotation/EdmAnnotationPathImpl.java | 4 +- .../core/edm/annotation/EdmApplyImpl.java | 8 +- .../core/edm/annotation/EdmCastImpl.java | 14 +- .../core/edm/annotation/EdmCollectionImpl.java | 8 +- .../EdmConstantAnnotationExpressionImpl.java | 14 +- .../commons/core/edm/annotation/EdmEqImpl.java | 4 +- .../commons/core/edm/annotation/EdmGeImpl.java | 4 +- .../commons/core/edm/annotation/EdmGtImpl.java | 4 +- .../commons/core/edm/annotation/EdmIfImpl.java | 4 +- .../core/edm/annotation/EdmIsOfImpl.java | 14 +- .../edm/annotation/EdmLabeledElementImpl.java | 6 +- .../EdmLabeledElementReferenceImpl.java | 6 +- .../commons/core/edm/annotation/EdmLeImpl.java | 4 +- .../commons/core/edm/annotation/EdmLtImpl.java | 4 +- .../EdmNavigationPropertyPathImpl.java | 6 +- .../commons/core/edm/annotation/EdmNeImpl.java | 4 +- .../commons/core/edm/annotation/EdmNotImpl.java | 4 +- .../core/edm/annotation/EdmNullImpl.java | 6 +- .../commons/core/edm/annotation/EdmOrImpl.java | 4 +- .../core/edm/annotation/EdmPathImpl.java | 4 +- .../edm/annotation/EdmPropertyPathImpl.java | 4 +- .../edm/annotation/EdmPropertyValueImpl.java | 6 +- .../core/edm/annotation/EdmRecordImpl.java | 14 +- .../core/edm/annotation/EdmUrlRefImpl.java | 4 +- .../primitivetype/AbstractGeospatialType.java | 66 +- .../primitivetype/AbstractPrimitiveType.java | 8 +- .../core/edm/primitivetype/EdmBinary.java | 61 +- .../core/edm/primitivetype/EdmBoolean.java | 4 +- .../commons/core/edm/primitivetype/EdmByte.java | 8 +- .../commons/core/edm/primitivetype/EdmDate.java | 8 +- .../edm/primitivetype/EdmDateTimeOffset.java | 48 +- .../core/edm/primitivetype/EdmDecimal.java | 24 +- .../core/edm/primitivetype/EdmDouble.java | 10 +- .../core/edm/primitivetype/EdmDuration.java | 14 +- .../core/edm/primitivetype/EdmGeography.java | 6 +- .../primitivetype/EdmGeographyCollection.java | 4 +- .../primitivetype/EdmGeographyLineString.java | 4 +- .../EdmGeographyMultiLineString.java | 4 +- .../primitivetype/EdmGeographyMultiPoint.java | 6 +- .../primitivetype/EdmGeographyMultiPolygon.java | 4 +- .../edm/primitivetype/EdmGeographyPoint.java | 4 +- .../edm/primitivetype/EdmGeographyPolygon.java | 4 +- .../core/edm/primitivetype/EdmGeometry.java | 6 +- .../primitivetype/EdmGeometryCollection.java | 4 +- .../primitivetype/EdmGeometryLineString.java | 4 +- .../EdmGeometryMultiLineString.java | 4 +- .../primitivetype/EdmGeometryMultiPoint.java | 6 +- .../primitivetype/EdmGeometryMultiPolygon.java | 4 +- .../edm/primitivetype/EdmGeometryPoint.java | 4 +- .../edm/primitivetype/EdmGeometryPolygon.java | 4 +- .../commons/core/edm/primitivetype/EdmGuid.java | 8 +- .../core/edm/primitivetype/EdmInt16.java | 8 +- .../core/edm/primitivetype/EdmInt32.java | 8 +- .../core/edm/primitivetype/EdmInt64.java | 10 +- .../primitivetype/EdmPrimitiveTypeFactory.java | 6 +- .../core/edm/primitivetype/EdmSByte.java | 8 +- .../core/edm/primitivetype/EdmSingle.java | 10 +- .../core/edm/primitivetype/EdmStream.java | 8 +- .../core/edm/primitivetype/EdmString.java | 8 +- .../core/edm/primitivetype/EdmTimeOfDay.java | 22 +- .../primitivetype/SingletonPrimitiveType.java | 4 +- .../commons/core/edm/primitivetype/Uint7.java | 4 +- .../core/serialization/AbstractAtomDealer.java | 6 +- .../core/serialization/AtomDeserializer.java | 38 +- .../serialization/AtomGeoValueDeserializer.java | 23 +- .../serialization/AtomGeoValueSerializer.java | 15 +- .../core/serialization/AtomSerializer.java | 14 +- .../core/serialization/ContextURLParser.java | 18 +- .../serialization/JsonDeltaDeserializer.java | 3 +- .../core/serialization/JsonDeserializer.java | 38 +- .../serialization/JsonEntityDeserializer.java | 4 +- .../serialization/JsonEntitySerializer.java | 6 +- .../JsonEntitySetDeserializer.java | 4 +- .../serialization/JsonEntitySetSerializer.java | 4 +- .../serialization/JsonGeoValueDeserializer.java | 98 +- .../serialization/JsonGeoValueSerializer.java | 9 +- .../JsonODataErrorDeserializer.java | 4 +- .../JsonODataErrorDetailDeserializer.java | 6 +- .../serialization/JsonPropertyDeserializer.java | 4 +- .../serialization/JsonPropertySerializer.java | 6 +- .../core/serialization/JsonSerializer.java | 40 +- .../commons/core/edm/ActionMapKeyTest.java | 12 +- .../commons/core/edm/EdmImplCachingTest.java | 4 +- .../commons/core/edm/EdmImplCallCreateTest.java | 30 +- .../commons/core/edm/FunctionMapKeyTest.java | 12 +- .../primitivetype/CommonPrimitiveTypeTest.java | 22 +- .../core/edm/primitivetype/EdmBinaryTest.java | 16 +- .../core/edm/primitivetype/EdmBooleanTest.java | 8 +- .../core/edm/primitivetype/EdmByteTest.java | 14 +- .../core/edm/primitivetype/EdmDateTest.java | 12 +- .../primitivetype/EdmDateTimeOffsetTest.java | 14 +- .../core/edm/primitivetype/EdmDecimalTest.java | 14 +- .../core/edm/primitivetype/EdmDoubleTest.java | 14 +- .../core/edm/primitivetype/EdmDurationTest.java | 12 +- .../core/edm/primitivetype/EdmGeoTest.java | 18 +- .../core/edm/primitivetype/EdmGuidTest.java | 12 +- .../core/edm/primitivetype/EdmInt16Test.java | 14 +- .../core/edm/primitivetype/EdmInt32Test.java | 14 +- .../core/edm/primitivetype/EdmInt64Test.java | 14 +- .../core/edm/primitivetype/EdmNullTest.java | 8 +- .../core/edm/primitivetype/EdmSByteTest.java | 14 +- .../core/edm/primitivetype/EdmSingleTest.java | 14 +- .../core/edm/primitivetype/EdmStringTest.java | 8 +- .../edm/primitivetype/EdmTimeOfDayTest.java | 12 +- .../primitivetype/PrimitiveTypeBaseTest.java | 4 +- .../core/edm/primitivetype/UInt7Test.java | 10 +- .../serialization/AtomDeserializerTest.java | 394 +- .../serialization/ContextURLParserTest.java | 34 +- .../olingo/server/api/ClientServerError.java | 25 +- .../org/apache/olingo/server/api/OData.java | 8 +- .../server/api/ODataApplicationException.java | 28 +- .../olingo/server/api/ODataHttpHandler.java | 10 +- .../apache/olingo/server/api/ODataRequest.java | 8 +- .../apache/olingo/server/api/ODataResponse.java | 5 +- .../server/api/ODataTranslatedException.java | 16 +- .../olingo/server/api/ServiceMetadata.java | 10 +- .../olingo/server/api/batch/BatchFacade.java | 88 +- .../exception/BatchDeserializerException.java | 6 +- .../exception/BatchSerializerException.java | 4 +- .../api/deserializer/DeserializerException.java | 65 +- .../api/deserializer/DeserializerResult.java | 6 +- .../deserializer/FixedFormatDeserializer.java | 4 +- .../api/deserializer/ODataDeserializer.java | 17 +- .../api/deserializer/batch/BatchOptions.java | 39 +- .../deserializer/batch/BatchRequestPart.java | 26 +- .../deserializer/batch/ODataResponsePart.java | 40 +- .../olingo/server/api/edmx/EdmxReference.java | 10 +- .../server/api/edmx/EdmxReferenceInclude.java | 14 +- .../edmx/EdmxReferenceIncludeAnnotation.java | 25 +- .../ActionComplexCollectionProcessor.java | 20 +- .../api/processor/ActionComplexProcessor.java | 20 +- .../ActionEntityCollectionProcessor.java | 20 +- .../api/processor/ActionEntityProcessor.java | 20 +- .../ActionPrimitiveCollectionProcessor.java | 20 +- .../api/processor/ActionPrimitiveProcessor.java | 20 +- .../api/processor/ActionVoidProcessor.java | 14 +- .../server/api/processor/BatchProcessor.java | 21 +- .../processor/ComplexCollectionProcessor.java | 34 +- .../server/api/processor/ComplexProcessor.java | 34 +- .../CountComplexCollectionProcessor.java | 10 +- .../CountEntityCollectionProcessor.java | 10 +- .../CountPrimitiveCollectionProcessor.java | 10 +- .../server/api/processor/DefaultProcessor.java | 11 +- .../server/api/processor/DeltaProcessor.java | 30 +- .../processor/EntityCollectionProcessor.java | 12 +- .../server/api/processor/EntityProcessor.java | 48 +- .../server/api/processor/ErrorProcessor.java | 12 +- .../api/processor/MediaEntityProcessor.java | 44 +- .../server/api/processor/MetadataProcessor.java | 12 +- .../processor/PrimitiveCollectionProcessor.java | 38 +- .../api/processor/PrimitiveProcessor.java | 34 +- .../api/processor/PrimitiveValueProcessor.java | 12 +- .../olingo/server/api/processor/Processor.java | 8 +- .../processor/ReferenceCollectionProcessor.java | 16 +- .../api/processor/ReferenceProcessor.java | 34 +- .../api/processor/ServiceDocumentProcessor.java | 12 +- .../serializer/ComplexSerializerOptions.java | 4 +- .../serializer/CustomContentTypeSupport.java | 6 +- .../EntityCollectionSerializerOptions.java | 6 +- .../api/serializer/EntitySerializerOptions.java | 6 +- .../api/serializer/FixedFormatSerializer.java | 4 +- .../server/api/serializer/ODataSerializer.java | 22 +- .../serializer/PrimitiveSerializerOptions.java | 4 +- .../PrimitiveValueSerializerOptions.java | 4 +- .../api/serializer/RepresentationType.java | 58 +- .../api/serializer/SerializerException.java | 32 +- .../server/api/serializer/SerializerResult.java | 10 +- .../apache/olingo/server/api/uri/UriHelper.java | 14 +- .../apache/olingo/server/api/uri/UriInfo.java | 12 +- .../olingo/server/api/uri/UriInfoAll.java | 6 +- .../olingo/server/api/uri/UriInfoBatch.java | 6 +- .../olingo/server/api/uri/UriInfoCrossjoin.java | 4 +- .../olingo/server/api/uri/UriInfoEntityId.java | 8 +- .../olingo/server/api/uri/UriInfoKind.java | 4 +- .../olingo/server/api/uri/UriInfoMetadata.java | 4 +- .../olingo/server/api/uri/UriInfoResource.java | 10 +- .../olingo/server/api/uri/UriInfoService.java | 6 +- .../olingo/server/api/uri/UriParameter.java | 4 +- .../olingo/server/api/uri/UriResource.java | 4 +- .../server/api/uri/UriResourceAction.java | 4 +- .../api/uri/UriResourceComplexProperty.java | 4 +- .../olingo/server/api/uri/UriResourceCount.java | 6 +- .../server/api/uri/UriResourceEntitySet.java | 8 +- .../server/api/uri/UriResourceFunction.java | 8 +- .../olingo/server/api/uri/UriResourceIt.java | 4 +- .../olingo/server/api/uri/UriResourceKind.java | 4 +- .../server/api/uri/UriResourceLambdaAll.java | 4 +- .../server/api/uri/UriResourceLambdaAny.java | 4 +- .../api/uri/UriResourceLambdaVariable.java | 4 +- .../server/api/uri/UriResourceNavigation.java | 8 +- .../server/api/uri/UriResourcePartTyped.java | 4 +- .../api/uri/UriResourcePrimitiveProperty.java | 6 +- .../server/api/uri/UriResourceProperty.java | 4 +- .../olingo/server/api/uri/UriResourceRef.java | 6 +- .../olingo/server/api/uri/UriResourceRoot.java | 6 +- .../server/api/uri/UriResourceSingleton.java | 4 +- .../olingo/server/api/uri/UriResourceValue.java | 6 +- .../api/uri/queryoption/AliasQueryOption.java | 4 +- .../server/api/uri/queryoption/CountOption.java | 4 +- .../api/uri/queryoption/CustomQueryOption.java | 6 +- .../server/api/uri/queryoption/ExpandItem.java | 4 +- .../api/uri/queryoption/ExpandOption.java | 4 +- .../api/uri/queryoption/FilterOption.java | 4 +- .../api/uri/queryoption/FormatOption.java | 4 +- .../server/api/uri/queryoption/IdOption.java | 4 +- .../api/uri/queryoption/LevelsExpandOption.java | 4 +- .../server/api/uri/queryoption/OrderByItem.java | 4 +- .../api/uri/queryoption/OrderByOption.java | 4 +- .../server/api/uri/queryoption/QueryOption.java | 4 +- .../api/uri/queryoption/SearchOption.java | 4 +- .../server/api/uri/queryoption/SelectItem.java | 4 +- .../api/uri/queryoption/SelectOption.java | 4 +- .../server/api/uri/queryoption/SkipOption.java | 4 +- .../api/uri/queryoption/SkipTokenOption.java | 4 +- .../api/uri/queryoption/SystemQueryOption.java | 4 +- .../uri/queryoption/SystemQueryOptionKind.java | 4 +- .../server/api/uri/queryoption/TopOption.java | 4 +- .../api/uri/queryoption/expression/Alias.java | 4 +- .../api/uri/queryoption/expression/Binary.java | 4 +- .../expression/BinaryOperatorKind.java | 6 +- .../uri/queryoption/expression/Enumeration.java | 8 +- .../uri/queryoption/expression/Expression.java | 6 +- .../expression/ExpressionVisitException.java | 10 +- .../expression/ExpressionVisitor.java | 12 +- .../uri/queryoption/expression/LambdaRef.java | 4 +- .../api/uri/queryoption/expression/Literal.java | 4 +- .../api/uri/queryoption/expression/Member.java | 4 +- .../api/uri/queryoption/expression/Method.java | 4 +- .../uri/queryoption/expression/MethodKind.java | 6 +- .../uri/queryoption/expression/TypeLiteral.java | 4 +- .../api/uri/queryoption/expression/Unary.java | 4 +- .../expression/UnaryOperatorKind.java | 4 +- .../expression/VisitableExpression.java | 4 +- .../uri/queryoption/search/SearchBinary.java | 4 +- .../search/SearchBinaryOperatorKind.java | 4 +- .../queryoption/search/SearchExpression.java | 6 +- .../api/uri/queryoption/search/SearchTerm.java | 4 +- .../api/uri/queryoption/search/SearchUnary.java | 4 +- .../search/SearchUnaryOperatorKind.java | 4 +- .../olingo/server/api/ODataRequestTest.java | 8 +- .../server/api/TranslatedExceptionsTest.java | 7 +- .../server/core/ContentNegotiatorException.java | 8 +- .../server/core/DefaultRedirectProcessor.java | 2 +- .../server/core/ODataExceptionHelper.java | 38 +- .../apache/olingo/server/core/ODataHandler.java | 4 +- .../server/core/ODataHandlerException.java | 21 +- .../server/core/ODataHttpHandlerImpl.java | 21 +- .../apache/olingo/server/core/ODataImpl.java | 11 +- .../olingo/server/core/ServiceMetadataImpl.java | 14 +- .../core/batchhandler/BatchFascadeImpl.java | 9 +- .../server/core/batchhandler/BatchHandler.java | 4 +- .../core/batchhandler/BatchPartHandler.java | 12 +- .../BatchReferenceRewriter.java | 19 +- .../deserializer/DeserializerResultImpl.java | 20 +- .../FixedFormatDeserializerImpl.java | 7 +- .../core/deserializer/batch/BatchBodyPart.java | 2 +- .../core/deserializer/batch/BatchParser.java | 11 +- .../deserializer/batch/BatchParserCommon.java | 4 +- .../batch/BatchRequestTransformator.java | 2 +- .../batch/BatchTransformatorCommon.java | 2 +- .../batch/HttpRequestStatusLine.java | 10 +- .../deserializer/helper/ExpandTreeBuilder.java | 10 +- .../helper/ExpandTreeBuilderImpl.java | 38 +- .../json/ODataJsonDeserializer.java | 63 +- .../serializer/BatchResponseSerializer.java | 19 +- .../core/serializer/SerializerResultImpl.java | 14 +- .../serializer/json/ODataErrorSerializer.java | 5 +- .../serializer/json/ODataJsonSerializer.java | 30 +- .../serializer/utils/CircleStreamBuffer.java | 18 +- .../serializer/utils/ContextURLBuilder.java | 22 +- .../core/serializer/utils/ContextURLHelper.java | 28 +- .../serializer/utils/ExpandSelectHelper.java | 1 - .../xml/MetadataDocumentXmlSerializer.java | 1 - .../serializer/xml/ODataXmlSerializerImpl.java | 2 +- .../olingo/server/core/uri/UriHelperImpl.java | 11 +- .../olingo/server/core/uri/UriInfoImpl.java | 21 +- .../core/uri/UriResourceFunctionImpl.java | 6 +- .../core/uri/UriResourceWithKeysImpl.java | 6 +- .../uri/parser/CheckFullContextListener.java | 8 +- .../olingo/server/core/uri/parser/Parser.java | 6 +- .../server/core/uri/parser/UriContext.java | 29 +- .../server/core/uri/parser/UriDecoder.java | 8 +- .../core/uri/parser/UriParseTreeVisitor.java | 40 +- .../core/uri/parser/UriParserException.java | 6 +- .../uri/parser/UriParserSemanticException.java | 73 +- .../uri/parser/UriParserSyntaxException.java | 22 +- .../uri/queryoption/CustomQueryOptionImpl.java | 2 +- .../core/uri/queryoption/ExpandItemImpl.java | 4 +- .../core/uri/queryoption/ExpandOptionImpl.java | 6 +- .../core/uri/queryoption/OrderByOptionImpl.java | 6 +- .../core/uri/queryoption/SelectOptionImpl.java | 6 +- .../queryoption/expression/EnumerationImpl.java | 6 +- .../queryoption/expression/ExpressionImpl.java | 2 +- .../uri/queryoption/expression/MethodImpl.java | 6 +- .../uri/validator/UriValidationException.java | 9 +- .../server/core/uri/validator/UriValidator.java | 58 +- .../server/core/ContentNegotiatorTest.java | 14 +- .../server/core/ODataHttpHandlerImplTest.java | 72 +- .../core/TranslatedExceptionSubclassesTest.java | 21 +- .../batchhandler/MockedBatchHandlerTest.java | 26 +- .../FixedFormatDeserializerTest.java | 8 +- .../batch/BatchParserCommonTest.java | 88 +- .../batch/BatchRequestParserTest.java | 16 +- .../BufferedReaderIncludingLineEndingsTest.java | 16 +- .../core/deserializer/batch/HeaderTest.java | 9 +- .../batch/HttpRequestStatusLineTest.java | 21 +- .../json/ODataJsonDeserializerBasicTest.java | 2 +- .../core/edm/provider/AbstractEdmNamedTest.java | 12 +- .../edm/provider/EdmComplexTypeImplTest.java | 22 +- .../provider/EdmEntityContainerImplTest.java | 2 +- .../edm/provider/EdmEntityTypeImplTest.java | 2 +- .../server/core/edm/provider/EdmEnumTest.java | 81 +- .../core/edm/provider/EdmFunctionImplTest.java | 16 +- .../edm/provider/EdmFunctionImportImplTest.java | 20 +- .../edm/provider/EdmKeyPropertyRefImplTest.java | 14 +- .../core/edm/provider/EdmMemberImplTest.java | 6 +- .../provider/EdmNavigationPropertyImplTest.java | 24 +- .../core/edm/provider/EdmParameterImplTest.java | 14 +- .../core/edm/provider/EdmPropertyImplTest.java | 18 +- .../EdmProviderImplOverloadingTest.java | 24 +- .../core/edm/provider/EdmProviderImplTest.java | 24 +- .../edm/provider/EdmReturnTypeImplTest.java | 20 +- .../core/edm/provider/EdmSchemaImplTest.java | 2 +- .../edm/provider/EdmTypeDefinitionImplTest.java | 12 +- .../core/edm/provider/EdmTypeImplTest.java | 12 +- .../serializer/BatchResponseSerializerTest.java | 15 +- .../serializer/FixedFormatSerializerTest.java | 2 +- .../json/ClientErrorSerializerTest.java | 2 +- .../json/ODataJsonSerializerTest.java | 4 +- .../serializer/utils/ContextURLBuilderTest.java | 2 +- .../xml/MetadataDocumentXmlSerializerTest.java | 2 +- .../apache/olingo/server/tecsvc/Encoder.java | 10 +- .../olingo/server/tecsvc/TechnicalServlet.java | 6 +- .../olingo/server/tecsvc/data/ActionData.java | 19 +- .../olingo/server/tecsvc/data/DataCreator.java | 18 +- .../olingo/server/tecsvc/data/DataProvider.java | 33 +- .../server/tecsvc/data/EntityActionResult.java | 12 +- .../server/tecsvc/data/RequestValidator.java | 156 +- .../processor/TechnicalBatchProcessor.java | 14 +- .../processor/TechnicalEntityProcessor.java | 34 +- .../TechnicalPrimitiveComplexProcessor.java | 35 +- .../tecsvc/processor/TechnicalProcessor.java | 10 +- .../ExpandSystemQueryOptionHandler.java | 13 +- .../expression/ExpressionVisitorImpl.java | 28 +- .../expression/operand/TypedOperand.java | 16 +- .../expression/operand/VisitorOperand.java | 8 +- .../expression/operation/BinaryOperator.java | 14 +- .../operation/MethodCallOperator.java | 44 +- .../expression/operation/UnaryOperator.java | 23 +- .../expression/primitive/EdmNull.java | 37 +- .../queryoptions/options/CountHandler.java | 2 +- .../queryoptions/options/FilterHandler.java | 8 +- .../options/ServerSidePagingHandler.java | 2 +- .../queryoptions/options/SkipHandler.java | 2 +- .../SystemQueryOptionsRuntimeException.java | 2 +- .../server/tecsvc/provider/ActionProvider.java | 77 +- .../server/tecsvc/provider/EdmTechProvider.java | 6 +- .../tecsvc/provider/EntityTypeProvider.java | 30 +- .../tecsvc/provider/EnumTypeProvider.java | 4 +- .../tecsvc/provider/FunctionProvider.java | 34 +- .../tecsvc/provider/PropertyProvider.java | 48 +- .../server/tecsvc/provider/SchemaProvider.java | 23 +- .../server/tecsvc/data/DataProviderTest.java | 4 +- .../olingo/server/core/ODataHandlerTest.java | 10 +- .../json/AbstractODataDeserializerTest.java | 8 +- .../json/ODataDeserializerDeepInsertTest.java | 16 +- .../ODataDeserializerEntityCollectionTest.java | 12 +- ...ataJsonDeserializerActionParametersTest.java | 6 +- .../json/ODataJsonDeserializerEntityTest.java | 62 +- .../core/serializer/ExpandSelectMock.java | 4 +- .../json/ODataJsonSerializerTest.java | 256 +- .../serializer/json/ServiceDocumentTest.java | 24 +- .../serializer/utils/ContextURLHelperTest.java | 26 +- .../serializer/xml/MetadataDocumentTest.java | 6 +- .../olingo/server/core/uri/RawUriTest.java | 14 +- .../olingo/server/core/uri/UriHelperTest.java | 4 +- .../olingo/server/core/uri/UriInfoImplTest.java | 20 +- .../server/core/uri/UriResourceImplTest.java | 22 +- .../core/uri/antlr/TestFullResourcePath.java | 5552 +++++++++--------- .../olingo/server/core/uri/antlr/TestLexer.java | 8 +- .../core/uri/antlr/TestUriParserImpl.java | 1002 ++-- .../core/uri/queryoption/QueryOptionTest.java | 14 +- .../queryoption/expression/ExpressionTest.java | 14 +- .../core/uri/testutil/EdmTechTestProvider.java | 32 +- .../core/uri/testutil/ExpandValidator.java | 34 +- .../core/uri/testutil/FilterTreeToText.java | 8 +- .../core/uri/testutil/FilterValidator.java | 24 +- .../core/uri/testutil/ParseTreeToText.java | 10 +- .../core/uri/testutil/ParserValidator.java | 10 +- .../core/uri/testutil/ParserWithLogging.java | 4 +- .../core/uri/testutil/ResourceValidator.java | 40 +- .../core/uri/testutil/TestErrorLogger.java | 18 +- .../core/uri/testutil/TestUriValidator.java | 16 +- .../server/core/uri/testutil/TestValidator.java | 6 +- .../core/uri/testutil/TokenValidator.java | 12 +- .../core/uri/testutil/UriLexerWithTrace.java | 4 +- .../core/uri/validator/UriValidatorTest.java | 36 +- 952 files changed, 21696 insertions(+), 21767 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java index b04e7ed..a5ca333 100644 --- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java +++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -333,7 +333,7 @@ public abstract class AbstractServices { protected abstract InputStream exploreMultipart( final List<Attachment> attachments, final String boundary, final boolean continueOnError) - throws IOException; + throws IOException; protected void addItemIntro(final ByteArrayOutputStream bos) throws IOException { addItemIntro(bos, null); @@ -633,9 +633,9 @@ public abstract class AbstractServices { prop.setType(id.getValue().toString()); prop.setValue(ValueType.PRIMITIVE, id.getValue() == EdmPrimitiveTypeKind.Int32 - ? Integer.parseInt(entityKey) + ? Integer.parseInt(entityKey) : id.getValue() == EdmPrimitiveTypeKind.Guid - ? UUID.fromString(entityKey) + ? UUID.fromString(entityKey) : entityKey); entry.getProperties().add(prop); } @@ -677,7 +677,7 @@ public abstract class AbstractServices { result = new ResWrap<Entity>( URI.create(Constants.get(ConstantKey.ODATA_METADATA_PREFIX) + entitySetName + Constants.get(ConstantKey.ODATA_METADATA_ENTITY_SUFFIX)), - null, result.getPayload()); + null, result.getPayload()); final String path = Commons.getEntityBasePath(entitySetName, entityKey); FSManager.instance(version).putInMemory(result, path + Constants.get(ConstantKey.ENTITY)); @@ -786,7 +786,7 @@ public abstract class AbstractServices { path.append(metadata.getEntitySet(name).isSingleton() ? Constants.get(ConstantKey.ENTITY) - : Constants.get(ConstantKey.FEED)); + : Constants.get(ConstantKey.FEED)); final InputStream feed = FSManager.instance(version).readFile(path.toString(), acceptType); @@ -797,15 +797,15 @@ public abstract class AbstractServices { String newContent = new String(copy.toByteArray(), "UTF-8"); final Pattern salary = Pattern.compile(acceptType == Accept.ATOM ? "\\<d:Salary m:type=\"Edm.Int32\"\\>(-?\\d+)\\</d:Salary\\>" - : "\"Salary\":(-?\\d+),"); + : "\"Salary\":(-?\\d+),"); final Matcher salaryMatcher = salary.matcher(newContent); while (salaryMatcher.find()) { final Long newSalary = Long.valueOf(salaryMatcher.group(1)) + n; newContent = newContent. replaceAll("\"Salary\":" + salaryMatcher.group(1) + ",", "\"Salary\":" + newSalary + ","). - replaceAll("\\<d:Salary m:type=\"Edm.Int32\"\\>" + salaryMatcher.group(1) + "</d:Salary\\>", - "<d:Salary m:type=\"Edm.Int32\">" + newSalary + "</d:Salary>"); + replaceAll("\\<d:Salary m:type=\"Edm.Int32\"\\>" + salaryMatcher.group(1) + "</d:Salary\\>", + "<d:Salary m:type=\"Edm.Int32\">" + newSalary + "</d:Salary>"); } FSManager.instance(version).putInMemory(IOUtils.toInputStream(newContent, Constants.ENCODING), @@ -919,7 +919,7 @@ public abstract class AbstractServices { path.append(metadata.getEntitySet(name).isSingleton() ? Constants.get(ConstantKey.ENTITY) - : Constants.get(ConstantKey.FEED)); + : Constants.get(ConstantKey.FEED)); final InputStream feed = FSManager.instance(version).readFile(path.toString(), acceptType); return xml.createResponse(null, feed, Commons.getETag(basePath), acceptType); @@ -927,7 +927,7 @@ public abstract class AbstractServices { return xml.createFaultResponse(accept, e); } } - + @GET @Path("/{name}/{type:[a-zA-Z].*}") public Response getEntitySet(@Context final UriInfo uriInfo, @@ -941,7 +941,7 @@ public abstract class AbstractServices { @QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) final String orderby, @QueryParam("$skiptoken") @DefaultValue(StringUtils.EMPTY) final String skiptoken, @PathParam("type") final String type) { - + try { final Accept acceptType; if (StringUtils.isNotBlank(format)) { @@ -959,32 +959,32 @@ public abstract class AbstractServices { if (acceptType == Accept.XML || acceptType == Accept.TEXT) { throw new UnsupportedMediaTypeException("Unsupported media type"); } - + // search for entitySet ... final String basePath = name + File.separatorChar; final StringBuilder builder = new StringBuilder(); builder.append(basePath); - - if(type != null) { + + if (type != null) { builder.append(type).append(File.separatorChar); } - + if (StringUtils.isNotBlank(orderby)) { builder.append(Constants.get(ConstantKey.ORDERBY)).append(File.separatorChar). - append(orderby).append(File.separatorChar); + append(orderby).append(File.separatorChar); } if (StringUtils.isNotBlank(filter)) { builder.append(Constants.get(ConstantKey.FILTER)).append(File.separatorChar). - append(filter.replaceAll("/", ".")); + append(filter.replaceAll("/", ".")); } else if (StringUtils.isNotBlank(skiptoken)) { builder.append(Constants.get(ConstantKey.SKIP_TOKEN)).append(File.separatorChar). - append(skiptoken); + append(skiptoken); } else { builder.append(metadata.getEntitySet(name).isSingleton() ? Constants.get(ConstantKey.ENTITY) - : Constants.get(ConstantKey.FEED)); + : Constants.get(ConstantKey.FEED)); } final InputStream feed = FSManager.instance(version).readFile(builder.toString(), Accept.ATOM); @@ -1031,8 +1031,7 @@ public abstract class AbstractServices { return xml.createFaultResponse(accept, e); } } - - + /** * Retrieve entity set or function execution sample. * @@ -1082,7 +1081,7 @@ public abstract class AbstractServices { if (utils.getKey() == Accept.JSON_FULLMETA || utils.getKey() == Accept.ATOM) { entity = utils.getValue().addOperation(entity, "Sack", "#DefaultContainer.Sack", uriInfo.getAbsolutePath().toASCIIString() - + "/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"); + + "/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"); } return utils.getValue().createResponse( @@ -1201,9 +1200,9 @@ public abstract class AbstractServices { final String entitySetName, final String entityId, final String format, - String expand, + final String expand, final String select) { - + try { final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format); @@ -1838,9 +1837,9 @@ public abstract class AbstractServices { return xml.createResponse(null, searchForValue ? IOUtils.toInputStream( container.getPayload().isNull() ? StringUtils.EMPTY : stringValue(container.getPayload()), - Constants.ENCODING) : utils.writeProperty(acceptType, container), - Commons.getETag(Commons.getEntityBasePath(entitySetName, entityId)), - acceptType); + Constants.ENCODING) : utils.writeProperty(acceptType, container), + Commons.getETag(Commons.getEntityBasePath(entitySetName, entityId)), + acceptType); } private String stringValue(final Property property) { @@ -1928,7 +1927,7 @@ public abstract class AbstractServices { alink.setType(navProperties.get(property.getName()).isEntitySet() ? Constants.get(ConstantKey.ATOM_LINK_FEED) - : Constants.get(ConstantKey.ATOM_LINK_ENTRY)); + : Constants.get(ConstantKey.ATOM_LINK_ENTRY)); alink.setRel(Constants.get(ConstantKey.ATOM_LINK_REL) + property.getName()); @@ -1984,7 +1983,7 @@ public abstract class AbstractServices { link.setTitle(property.getKey()); link.setType(property.getValue().isEntitySet() ? Constants.get(ConstantKey.ATOM_LINK_FEED) - : Constants.get(ConstantKey.ATOM_LINK_ENTRY)); + : Constants.get(ConstantKey.ATOM_LINK_ENTRY)); link.setRel(Constants.get(ConstantKey.ATOM_LINK_REL) + property.getKey()); link.setHref(entitySetName + "(" + entityKey + ")/" + property.getKey()); entry.getNavigationLinks().add(link); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java b/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java index 30a9bca..204ea94 100644 --- a/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java +++ b/fit/src/main/java/org/apache/olingo/fit/UnsupportedMediaTypeException.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/V4Demo.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java index 5d15b38..e723cde 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,16 +18,10 @@ */ package org.apache.olingo.fit; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.apache.olingo.fit.methods.PATCH; -import org.apache.olingo.fit.utils.Accept; -import org.apache.olingo.fit.utils.ConstantKey; -import org.apache.olingo.fit.utils.Constants; -import org.apache.olingo.fit.utils.FSManager; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; import javax.ws.rs.Consumes; import javax.ws.rs.DefaultValue; @@ -43,10 +37,17 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.apache.olingo.fit.methods.PATCH; +import org.apache.olingo.fit.utils.Accept; +import org.apache.olingo.fit.utils.ConstantKey; +import org.apache.olingo.fit.utils.Constants; +import org.apache.olingo.fit.utils.FSManager; +import org.springframework.stereotype.Service; @Service @Path("/V40/Demo.svc") http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java b/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java index 847f740..dbb7cca 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,11 +18,10 @@ */ package org.apache.olingo.fit; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.fit.methods.PATCH; -import org.apache.olingo.fit.utils.Constants; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -39,10 +38,12 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.fit.methods.PATCH; +import org.apache.olingo.fit.utils.Constants; +import org.springframework.stereotype.Service; @Service @Path("/V40/KeyAsSegment.svc") @@ -55,7 +56,7 @@ public class V4KeyAsSegment extends V4Services { private Response replaceServiceName(final Response response) { try { final String content = IOUtils.toString((InputStream) response.getEntity(), Constants.ENCODING). - replaceAll("Static\\.svc", "KeyAsSegment.svc"); + replaceAll("Static\\.svc", "KeyAsSegment.svc"); final Response.ResponseBuilder builder = Response.status(response.getStatus()); for (String headerName : response.getHeaders().keySet()) { @@ -82,76 +83,76 @@ public class V4KeyAsSegment extends V4Services { @Path("/{entitySetName}/{entityId}") @Override public Response getEntity( - @Context final UriInfo uriInfo, - @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, - @PathParam("entitySetName") final String entitySetName, - @PathParam("entityId") final String entityId, - @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format, - @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand, - @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) { + @Context final UriInfo uriInfo, + @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, + @PathParam("entitySetName") final String entitySetName, + @PathParam("entityId") final String entityId, + @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format, + @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand, + @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) { return replaceServiceName(super.getEntityInternal(uriInfo.getRequestUri().toASCIIString(), - accept, entitySetName, entityId, format, expand, select)); + accept, entitySetName, entityId, format, expand, select)); } @DELETE @Path("/{entitySetName}/{entityId}") @Override public Response removeEntity( - @PathParam("entitySetName") final String entitySetName, - @PathParam("entityId") final String entityId) { + @PathParam("entitySetName") final String entitySetName, + @PathParam("entityId") final String entityId) { return replaceServiceName(super.removeEntity(entitySetName, entityId)); } @PATCH @Path("/{entitySetName}/{entityId}") - @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON}) - @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON}) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON }) + @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON }) @Override public Response patchEntity( - @Context final UriInfo uriInfo, - @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, - @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType, - @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer, - @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch, - @PathParam("entitySetName") final String entitySetName, - @PathParam("entityId") final String entityId, - final String changes) { + @Context final UriInfo uriInfo, + @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, + @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType, + @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer, + @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch, + @PathParam("entitySetName") final String entitySetName, + @PathParam("entityId") final String entityId, + final String changes) { return replaceServiceName(super.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId, - changes)); + changes)); } @PUT @Path("/{entitySetName}/{entityId}") - @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON}) - @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON}) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON }) + @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON }) public Response putNewEntity( - @Context final UriInfo uriInfo, - @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, - @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType, - @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer, - @PathParam("entitySetName") final String entitySetName, - @PathParam("entityId") final String entityId, - final String entity) { + @Context final UriInfo uriInfo, + @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, + @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType, + @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer, + @PathParam("entitySetName") final String entitySetName, + @PathParam("entityId") final String entityId, + final String entity) { return replaceServiceName(super - .replaceEntity(uriInfo, accept, contentType, prefer, entitySetName, entityId, entity)); + .replaceEntity(uriInfo, accept, contentType, prefer, entitySetName, entityId, entity)); } @POST @Path("/{entitySetName}") - @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON}) - @Consumes({MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM}) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON }) + @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM }) @Override public Response postNewEntity( - @Context final UriInfo uriInfo, - @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, - @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType, - @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer, - @PathParam("entitySetName") final String entitySetName, - final String entity) { + @Context final UriInfo uriInfo, + @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, + @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType, + @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer, + @PathParam("entitySetName") final String entitySetName, + final String entity) { return replaceServiceName(super.postNewEntity(uriInfo, accept, contentType, prefer, entitySetName, entity)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java b/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java index f962be4..071e717 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,16 +18,17 @@ */ package org.apache.olingo.fit; +import java.io.IOException; + +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; + import org.apache.cxf.interceptor.InInterceptors; import org.apache.olingo.fit.rest.XHTTPMethodInterceptor; import org.apache.olingo.fit.utils.ConstantKey; import org.apache.olingo.fit.utils.Constants; import org.springframework.stereotype.Service; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; -import java.io.IOException; - @Service @Path("/V40/NorthWind.svc") @InInterceptors(classes = XHTTPMethodInterceptor.class) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java b/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java index ac725ac..fad9bda 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,6 +18,11 @@ */ package org.apache.olingo.fit; +import java.io.IOException; + +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; + import org.apache.cxf.interceptor.InInterceptors; import org.apache.olingo.fit.rest.ResolvingReferencesInterceptor; import org.apache.olingo.fit.rest.XHTTPMethodInterceptor; @@ -25,13 +30,9 @@ import org.apache.olingo.fit.utils.ConstantKey; import org.apache.olingo.fit.utils.Constants; import org.springframework.stereotype.Service; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; -import java.io.IOException; - @Service @Path("/V40/NorthWindExt.svc") -@InInterceptors(classes = {XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class}) +@InInterceptors(classes = { XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class }) public class V4NorthWindExt extends V4Services { public V4NorthWindExt() throws IOException { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java b/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java index dd5e89e..a0ab3be 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,10 +18,12 @@ */ package org.apache.olingo.fit; -import org.springframework.stereotype.Service; -import javax.ws.rs.Path; import java.io.IOException; +import javax.ws.rs.Path; + +import org.springframework.stereotype.Service; + @Service @Path("/V40/OAuth2.svc") public class V4OAuth2 extends V4Services { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java index 926663d..ba902f5 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -18,15 +18,10 @@ */ package org.apache.olingo.fit; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.apache.olingo.fit.utils.Accept; -import org.apache.olingo.fit.utils.ConstantKey; -import org.apache.olingo.fit.utils.Constants; -import org.apache.olingo.fit.utils.FSManager; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -42,10 +37,16 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.apache.olingo.fit.utils.Accept; +import org.apache.olingo.fit.utils.ConstantKey; +import org.apache.olingo.fit.utils.Constants; +import org.apache.olingo.fit.utils.FSManager; +import org.springframework.stereotype.Service; @Service @Path("/V40/OpenType.svc") http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/V4Services.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Services.java b/fit/src/main/java/org/apache/olingo/fit/V4Services.java index 4b1cd1f..c3d8a77 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Services.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4Services.java @@ -176,7 +176,6 @@ public class V4Services extends AbstractServices { @PUT @Path("/People(1)/Parent") - @SuppressWarnings("unused") public Response changeSingleValuedNavigationPropertyReference( @Context final UriInfo uriInfo, @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, @@ -187,7 +186,7 @@ public class V4Services extends AbstractServices { final Accept contentTypeValue = Accept.parse(contentType); assert contentTypeValue == Accept.JSON; - ResWrap<Entity> entity = jsonDeserializer.toEntity(IOUtils.toInputStream(content, Constants.ENCODING)); + jsonDeserializer.toEntity(IOUtils.toInputStream(content, Constants.ENCODING)); return Response.noContent().type(MediaType.APPLICATION_JSON).build(); } catch (Exception e) { @@ -1074,7 +1073,7 @@ public class V4Services extends AbstractServices { public Response getContainedEntitySet( @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept, @PathParam("entityId") final String entityId, - @PathParam("containedEntitySetName") String containedEntitySetName, + @PathParam("containedEntitySetName") final String containedEntitySetName, @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) { String tempContainedESName = containedEntitySetName; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java index 144de7d..099c8ab 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -59,8 +59,8 @@ public class V4Vocabularies { null, FSManager.instance(ODataServiceVersion.V40).readRes( "vocabularies-" + Constants.get(ConstantKey.METADATA), Accept.XML), - null, - Accept.XML); + null, + Accept.XML); } catch (Exception e) { return xml.createFaultResponse(Accept.XML.toString(), e); }
