Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/280bc019 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/280bc019 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/280bc019 Branch: refs/heads/master Commit: 280bc019cebd8d05f7f27ecd2b069e3eb5300a69 Parents: 6d94f0e 53065cd Author: Ramesh Reddy <[email protected]> Authored: Sat Feb 6 13:32:04 2016 -0600 Committer: Ramesh Reddy <[email protected]> Committed: Sat Feb 6 13:32:04 2016 -0600 ---------------------------------------------------------------------- .../commons/AbstractInvocationHandler.java | 17 +- .../AbstractStructuredInvocationHandler.java | 2 +- .../commons/AnnotatationsInvocationHandler.java | 2 +- .../ComplexCollectionInvocationHandler.java | 2 +- .../proxy/commons/ComplexInvocationHandler.java | 6 +- .../proxy/commons/EdmStreamValueHandler.java | 2 +- .../EntityCollectionInvocationHandler.java | 2 +- .../EntityContainerInvocationHandler.java | 4 +- .../proxy/commons/EntityInvocationHandler.java | 6 +- .../commons/EntitySetInvocationHandler.java | 2 +- .../proxy/commons/InvokerInvocationHandler.java | 2 +- .../commons/OperationInvocationHandler.java | 2 +- .../PrimitiveCollectionInvocationHandler.java | 2 +- ...turedComposableInvokerInvocationHandler.java | 2 +- .../olingo/ext/proxy/utils/CoreUtils.java | 5 +- .../org/apache/olingo/fit/AbstractServices.java | 1947 -------------- .../main/java/org/apache/olingo/fit/Demo.java | 6 +- .../java/org/apache/olingo/fit/OpenType.java | 5 +- .../java/org/apache/olingo/fit/Services.java | 2511 +++++++++++++++--- .../org/apache/olingo/fit/Vocabularies.java | 10 +- .../apache/olingo/fit/metadata/EntitySet.java | 8 - .../olingo/fit/rest/OAuth2RequestFilter.java | 3 +- .../fit/serializer/FITAtomDeserializer.java | 13 +- .../olingo/fit/utils/AbstractUtilities.java | 22 +- .../org/apache/olingo/fit/utils/Accept.java | 31 +- .../org/apache/olingo/fit/utils/Commons.java | 24 +- .../apache/olingo/fit/utils/ConstantKey.java | 10 +- .../org/apache/olingo/fit/utils/Constants.java | 7 - .../org/apache/olingo/fit/utils/FSManager.java | 25 +- .../fit/utils/InjectableSerializerProvider.java | 42 - .../apache/olingo/fit/utils/JSONUtilities.java | 14 +- .../olingo/fit/utils/MetadataLinkInfo.java | 182 -- .../apache/olingo/fit/utils/XMLUtilities.java | 3 + .../proxy/demo/odatademo/types/Customer.java | 6 +- .../proxy/demo/odatademo/types/Employee.java | 6 +- .../demo/odatademo/types/FeaturedProduct.java | 6 +- .../opentypesservice/types/IndexedRow.java | 8 +- .../odatawcfservice/types/CreditCardPI.java | 6 +- .../odatawcfservice/types/Customer.java | 6 +- .../odatawcfservice/types/Employee.java | 6 +- .../odatawcfservice/types/PublicCompany.java | 8 +- .../tecsvc/client/EntityReferencesITCase.java | 13 +- .../ExpandWithSystemQueryOptionsITCase.java | 74 +- .../core/domain/AbstractClientEntitySet.java | 114 - .../core/domain/ClientCollectionValueImpl.java | 2 +- .../client/core/domain/ClientEntitySetImpl.java | 74 +- .../core/domain/ClientPrimitiveValueImpl.java | 5 +- .../client/core/domain/ClientPropertyImpl.java | 135 +- .../client/core/domain/ClientValuableImpl.java | 22 +- .../core/serialization/ODataBinderImpl.java | 2 +- .../apache/olingo/client/core/AbstractTest.java | 9 +- .../org/apache/olingo/client/core/AtomTest.java | 6 - .../olingo/client/core/EntitySetTest.java | 22 +- .../apache/olingo/client/core/EntityTest.java | 73 +- .../apache/olingo/client/core/ErrorTest.java | 8 +- .../org/apache/olingo/client/core/JSONTest.java | 46 +- .../apache/olingo/client/core/MetadataTest.java | 33 +- .../olingo/client/core/PrimitiveValueTest.java | 22 +- .../apache/olingo/client/core/PropertyTest.java | 38 +- .../olingo/client/core/ServiceDocumentTest.java | 16 +- .../client/core/uri/FilterFactoryTest.java | 8 +- .../olingo/client/core/uri/URIBuilderTest.java | 71 +- .../olingo/commons/api/edm/geo/Geospatial.java | 7 +- .../commons/core/edm/EdmEntityTypeImpl.java | 7 +- .../core/edm/EdmNavigationPropertyImpl.java | 3 +- .../commons/core/edm/EdmParameterImpl.java | 3 +- .../commons/core/edm/EdmPropertyImpl.java | 5 +- .../edm/provider/EdmEntityTypeImplTest.java | 19 + .../uri/queryoption/SystemQueryOptionKind.java | 22 +- .../apache/olingo/server/core/ODataHandler.java | 4 +- .../server/core/ODataHttpHandlerImpl.java | 19 +- .../core/batchhandler/BatchFacadeImpl.java | 18 +- .../server/core/batchhandler/BatchHandler.java | 2 +- .../olingo/server/core/uri/UriInfoImpl.java | 37 +- .../server/core/uri/parser/ExpandParser.java | 30 +- .../core/uri/parser/ExpressionParser.java | 85 +- .../server/core/uri/parser/FilterParser.java | 6 +- .../server/core/uri/parser/OrderByParser.java | 6 +- .../olingo/server/core/uri/parser/Parser.java | 354 +-- .../server/core/uri/parser/ParserHelper.java | 168 +- .../core/uri/parser/ResourcePathParser.java | 38 +- .../server/core/uri/parser/SelectParser.java | 12 +- .../server/core/uri/parser/UriTokenizer.java | 12 +- .../uri/queryoption/expression/AliasImpl.java | 9 +- .../uri/validator/UriValidationException.java | 4 +- .../server/core/uri/validator/UriValidator.java | 513 +--- .../server-core-exceptions-i18n.properties | 1 + .../olingo/server/core/uri/UriInfoImplTest.java | 50 +- .../core/uri/parser/ExpressionParserTest.java | 2 +- .../core/uri/parser/UriTokenizerTest.java | 3 + .../olingo/server/tecsvc/data/DataProvider.java | 12 +- .../SystemQueryOptionsRuntimeException.java | 3 +- .../tecsvc/provider/ContainerProvider.java | 6 +- .../core/uri/parser/TestFullResourcePath.java | 112 +- .../core/uri/queryoption/QueryOptionTest.java | 4 +- .../queryoption/expression/ExpressionTest.java | 6 +- .../core/uri/testutil/FilterValidator.java | 51 +- .../core/uri/validator/UriValidatorTest.java | 68 +- 98 files changed, 3310 insertions(+), 4157 deletions(-) ----------------------------------------------------------------------
