[OLINGO-832] Merge branch 'master' into OLINGO-832_StreamSerializerPoC
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/67494a78 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/67494a78 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/67494a78 Branch: refs/heads/master Commit: 67494a789798911fee97388e204952ff4c357723 Parents: 5174f70 3c205f9 Author: mibo <[email protected]> Authored: Sat Feb 13 07:28:32 2016 +0100 Committer: mibo <[email protected]> Committed: Sat Feb 13 07:28:32 2016 +0100 ---------------------------------------------------------------------- .../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 +- .../client/AbstractParamTecSvcITCase.java | 14 + .../olingo/fit/tecsvc/client/BasicITCase.java | 34 +- .../fit/tecsvc/client/BatchClientITCase.java | 8 +- .../olingo/fit/tecsvc/client/BindingITCase.java | 10 +- .../fit/tecsvc/client/DeepInsertITCase.java | 31 +- .../tecsvc/client/EntityReferencesITCase.java | 13 +- .../ExpandWithSystemQueryOptionsITCase.java | 74 +- .../tecsvc/client/FilterSystemQueryITCase.java | 4 +- .../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/api/edm/provider/CsdlOnDelete.java | 23 +- .../api/edm/provider/CsdlReturnType.java | 23 +- .../olingo/commons/api/http/HttpHeader.java | 2 + .../olingo/server/api/edmx/EdmxReference.java | 24 +- .../commons/core/edm/EdmEntityTypeImpl.java | 7 +- .../core/edm/EdmNavigationPropertyImpl.java | 3 +- .../commons/core/edm/EdmParameterImpl.java | 3 +- .../commons/core/edm/EdmPropertyImpl.java | 5 +- .../commons/core/edm/primitivetype/EdmDate.java | 5 +- .../edm/primitivetype/EdmDateTimeOffset.java | 62 +- .../core/edm/primitivetype/EdmTimeOfDay.java | 20 +- .../core/edm/primitivetype/EdmDateTest.java | 1 - .../primitivetype/EdmDateTimeOffsetTest.java | 9 +- .../edm/primitivetype/EdmTimeOfDayTest.java | 23 +- .../edm/provider/EdmEntityTypeImplTest.java | 19 + .../org/apache/olingo/server/api/OData.java | 10 + .../uri/queryoption/SystemQueryOptionKind.java | 22 +- .../apache/olingo/server/core/ErrorHandler.java | 47 +- .../olingo/server/core/MetadataParser.java | 582 +++- .../olingo/server/core/OData4HttpHandler.java | 10 +- .../olingo/server/core/ReferenceResolver.java | 33 + .../server/core/SchemaBasedEdmProvider.java | 137 +- .../olingo/server/core/ServiceDispatcher.java | 48 +- .../olingo/server/core/ServiceHandler.java | 27 +- .../core/legacy/ProcessorServiceHandler.java | 12 + .../server/core/requests/ActionRequest.java | 2 +- .../server/core/requests/BatchRequest.java | 11 +- .../server/core/requests/DataRequest.java | 6 +- .../server/core/responses/EntityResponse.java | 1 + .../core/responses/EntitySetResponse.java | 2 + .../server/core/responses/ErrorResponse.java | 58 + .../server/core/responses/MetadataResponse.java | 2 + .../server/core/responses/PropertyResponse.java | 2 + .../core/responses/ServiceDocumentResponse.java | 2 + .../core/responses/ServiceResponseVisior.java | 4 + .../resources/Org.OData.Capabilities.V1.xml | 388 +++ .../src/main/resources/Org.OData.Core.V1.xml | 187 ++ .../main/resources/Org.OData.Measures.V1.xml | 110 + .../core/MetadataParserAnnotationsTest.java | 215 ++ .../olingo/server/core/MetadataParserTest.java | 3 +- .../server/core/ServiceDispatcherTest.java | 17 +- .../olingo/server/example/TripPinDataModel.java | 2 +- .../olingo/server/example/TripPinHandler.java | 14 +- .../server/example/TripPinServiceTest.java | 10 + .../olingo/server/example/TripPinServlet.java | 11 +- .../src/test/resources/annotations.xml | 153 ++ .../src/test/resources/trippin.xml | 808 +++--- .../apache/olingo/server/core/ODataHandler.java | 4 +- .../server/core/ODataHttpHandlerImpl.java | 19 +- .../apache/olingo/server/core/ODataImpl.java | 13 + .../core/batchhandler/BatchFacadeImpl.java | 18 +- .../server/core/batchhandler/BatchHandler.java | 2 +- .../json/ODataJsonDeserializer.java | 77 +- .../deserializer/xml/ODataXmlDeserializer.java | 84 +- .../serializer/json/ODataJsonSerializer.java | 42 +- .../core/serializer/xml/ODataXmlSerializer.java | 18 +- .../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/DataCreator.java | 27 +- .../olingo/server/tecsvc/data/DataProvider.java | 12 +- .../SystemQueryOptionsRuntimeException.java | 3 +- .../tecsvc/provider/ComplexTypeProvider.java | 8 + .../tecsvc/provider/ContainerProvider.java | 6 +- .../server/tecsvc/data/DataProviderTest.java | 14 + .../AbstractODataDeserializerTest.java | 5 +- .../ODataDeserializerEntityCollectionTest.java | 4 +- ...ataJsonDeserializerActionParametersTest.java | 2 +- .../json/ODataJsonDeserializerEntityTest.java | 46 +- ...DataXMLDeserializerActionParametersTest.java | 2 +- .../xml/ODataXmlDeserializerTest.java | 43 +- .../json/ODataJsonSerializerTest.java | 47 +- .../serializer/xml/ODataXmlSerializerTest.java | 77 +- .../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 +- 161 files changed, 6352 insertions(+), 4831 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67494a78/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67494a78/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67494a78/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java ----------------------------------------------------------------------
