Merge branch 'IEE754Compatible'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/9998ba67 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/9998ba67 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/9998ba67 Branch: refs/heads/olingo712 Commit: 9998ba6748a9086614e0d5309ade935002c584ec Parents: 21b36a8 ef1fd77 Author: Christian Holzer <[email protected]> Authored: Wed Jun 24 16:36:21 2015 +0200 Committer: Christian Holzer <[email protected]> Committed: Wed Jun 24 16:36:21 2015 +0200 ---------------------------------------------------------------------- .../olingo/ext/proxy/AbstractService.java | 4 +- .../EntityContainerInvocationHandler.java | 1 + .../proxy/commons/EntityInvocationHandler.java | 6 +- .../commons/EntitySetInvocationHandler.java | 6 +- .../olingo/ext/pojogen/AbstractPOJOGenMojo.java | 4 +- .../org/apache/olingo/fit/AbstractServices.java | 2 +- .../olingo/fit/utils/AbstractUtilities.java | 3 +- .../org/apache/olingo/fit/utils/FSManager.java | 3 +- .../olingo/fit/AbstractBaseTestITCase.java | 11 +- .../fit/tecsvc/client/ActionImportITCase.java | 4 +- .../olingo/fit/tecsvc/client/BasicITCase.java | 376 ++++++++++++++++++- .../fit/tecsvc/client/BatchClientITCase.java | 23 +- .../olingo/fit/tecsvc/client/BindingITCase.java | 6 +- .../fit/tecsvc/client/ConditionalITCase.java | 4 +- .../fit/tecsvc/client/DeepInsertITCase.java | 6 +- .../tecsvc/client/EntityReferencesITCase.java | 4 +- .../ExpandWithSystemQueryOptionsITCase.java | 4 +- .../tecsvc/client/FilterSystemQueryITCase.java | 4 +- .../fit/tecsvc/client/FunctionImportITCase.java | 4 +- .../olingo/fit/tecsvc/client/MediaITCase.java | 3 +- .../fit/tecsvc/client/NavigationITCase.java | 4 +- .../tecsvc/client/OrderBySystemQueryITCase.java | 4 +- .../tecsvc/client/PrimitiveComplexITCase.java | 3 +- .../tecsvc/client/SystemQueryOptionITCase.java | 4 +- .../olingo/fit/tecsvc/http/BasicHttpITCase.java | 54 ++- .../olingo/fit/v4/AbstractTestITCase.java | 17 +- .../apache/olingo/fit/v4/AsyncTestITCase.java | 20 +- .../olingo/fit/v4/AuthBatchTestITCase.java | 5 +- .../apache/olingo/fit/v4/BatchTestITCase.java | 21 +- .../fit/v4/BoundOperationInvokeTestITCase.java | 52 +-- .../olingo/fit/v4/ConformanceTestITCase.java | 30 +- .../apache/olingo/fit/v4/DeltaTestITCase.java | 8 +- .../olingo/fit/v4/DerivedTypeTestITCase.java | 22 +- .../olingo/fit/v4/EntityCreateTestITCase.java | 26 +- .../olingo/fit/v4/EntityRetrieveTestITCase.java | 89 ++--- .../olingo/fit/v4/EntitySetTestITCase.java | 38 +- .../olingo/fit/v4/EntityUpdateTestITCase.java | 32 +- .../olingo/fit/v4/ErrorResponseTestITCase.java | 4 +- .../olingo/fit/v4/FilterFactoryTestITCase.java | 4 +- .../fit/v4/JSONFormatConformanceTestITCase.java | 12 +- .../olingo/fit/v4/KeyAsSegmentTestITCase.java | 24 +- .../olingo/fit/v4/MediaEntityTestITCase.java | 28 +- .../apache/olingo/fit/v4/OAuth2TestITCase.java | 14 +- .../olingo/fit/v4/OpenTypeTestITCase.java | 26 +- .../fit/v4/OperationImportInvokeTestITCase.java | 38 +- .../olingo/fit/v4/PropertyTestITCase.java | 42 +-- .../olingo/fit/v4/PropertyValueTestITCase.java | 22 +- .../olingo/fit/v4/QueryOptionsTestITCase.java | 6 +- .../fit/v4/ServiceDocumentTestITCase.java | 10 +- .../olingo/fit/v4/SingletonTestITCase.java | 30 +- .../apache/olingo/client/api/Configuration.java | 17 +- .../apache/olingo/client/api/ODataClient.java | 9 +- .../olingo/client/api/ODataClientBuilder.java | 8 +- .../request/ODataBasicRequest.java | 8 +- .../streamed/ODataStreamedEntityRequest.java | 7 +- .../api/domain/ClientEntitySetIterator.java | 22 +- .../client/api/domain/ClientPrimitiveValue.java | 3 + .../client/api/serialization/ODataReader.java | 28 +- .../client/api/serialization/ODataWriter.java | 26 +- .../olingo/client/core/ConfigurationImpl.java | 31 +- .../olingo/client/core/ODataClientFactory.java | 4 +- .../olingo/client/core/ODataClientImpl.java | 19 +- .../header/ODataErrorResponseChecker.java | 37 +- .../request/AbstractODataBasicRequest.java | 8 +- .../request/AbstractODataRequest.java | 8 +- .../request/cud/ODataDeleteRequestImpl.java | 4 +- .../cud/ODataEntityCreateRequestImpl.java | 10 +- .../cud/ODataEntityUpdateRequestImpl.java | 10 +- .../cud/ODataPropertyUpdateRequestImpl.java | 10 +- .../cud/ODataReferenceAddingRequestImpl.java | 6 +- .../cud/ODataValueUpdateRequestImpl.java | 12 +- .../invoke/AbstractODataInvokeRequest.java | 29 +- .../request/invoke/ODataInvokeRequestImpl.java | 14 +- .../retrieve/AbstractMetadataRequestImpl.java | 5 +- .../request/retrieve/ODataDeltaRequestImpl.java | 8 +- .../retrieve/ODataEntityRequestImpl.java | 8 +- .../ODataEntitySetIteratorRequestImpl.java | 8 +- .../retrieve/ODataEntitySetRequestImpl.java | 8 +- .../request/retrieve/ODataMediaRequestImpl.java | 8 +- .../retrieve/ODataPropertyRequestImpl.java | 8 +- .../request/retrieve/ODataRawRequestImpl.java | 4 +- .../ODataServiceDocumentRequestImpl.java | 8 +- .../request/retrieve/ODataValueRequestImpl.java | 10 +- .../retrieve/XMLMetadataRequestImpl.java | 4 +- .../AbstractODataStreamedEntityRequest.java | 16 +- .../streamed/AbstractODataStreamedRequest.java | 3 +- .../core/domain/ClientPrimitiveValueImpl.java | 6 + .../ClientODataDeserializerImpl.java | 20 +- .../serialization/JsonEntitySerializer.java | 16 +- .../serialization/JsonEntitySetSerializer.java | 7 +- .../serialization/JsonPropertySerializer.java | 5 +- .../core/serialization/JsonSerializer.java | 57 +-- .../core/serialization/ODataBinderImpl.java | 16 +- .../core/serialization/ODataReaderImpl.java | 50 +-- .../core/serialization/ODataWriterImpl.java | 30 +- .../apache/olingo/client/core/AbstractTest.java | 7 +- .../apache/olingo/client/core/v4/AtomTest.java | 22 +- .../olingo/client/core/v4/EntitySetTest.java | 42 +-- .../olingo/client/core/v4/EntityTest.java | 104 ++--- .../apache/olingo/client/core/v4/ErrorTest.java | 22 +- .../apache/olingo/client/core/v4/JSONTest.java | 52 +-- .../olingo/client/core/v4/MetadataTest.java | 14 +- .../olingo/client/core/v4/PropertyTest.java | 58 +-- .../client/core/v4/ServiceDocumentTest.java | 34 +- .../olingo/commons/api/format/AcceptType.java | 6 +- .../olingo/commons/api/format/ContentType.java | 60 ++- .../olingo/commons/api/format/ODataFormat.java | 126 ------- .../commons/api/format/AcceptTypeTest.java | 6 +- .../org/apache/olingo/server/api/OData.java | 10 +- .../server/api/processor/DefaultProcessor.java | 7 +- .../serializer/ComplexSerializerOptions.java | 6 +- .../EntityCollectionSerializerOptions.java | 4 +- .../api/serializer/EntitySerializerOptions.java | 4 +- .../server/api/serializer/ODataSerializer.java | 15 +- .../serializer/PrimitiveSerializerOptions.java | 6 +- .../ReferenceCollectionSerializerOptions.java | 71 ++++ .../serializer/ReferenceSerializerOptions.java | 57 +++ .../apache/olingo/server/core/ErrorHandler.java | 8 +- .../olingo/server/core/ServiceRequest.java | 16 +- .../server/core/requests/DataRequest.java | 12 +- .../olingo/server/example/TripPinDataModel.java | 3 +- .../olingo/server/core/ContentNegotiator.java | 37 +- .../apache/olingo/server/core/ODataHandler.java | 3 +- .../apache/olingo/server/core/ODataImpl.java | 44 +-- .../json/ODataJsonDeserializer.java | 50 ++- .../serializer/json/ODataJsonSerializer.java | 116 +++--- .../json/ServiceDocumentJsonSerializer.java | 11 +- .../serializer/utils/ContentTypeHelper.java | 28 ++ .../serializer/xml/ODataXmlSerializerImpl.java | 8 +- .../olingo/server/core/uri/parser/Parser.java | 10 +- .../server/core/ContentNegotiatorTest.java | 46 ++- .../json/ODataJsonDeserializerBasicTest.java | 28 +- .../json/ODataJsonSerializerTest.java | 4 +- .../json/ServerErrorSerializerTest.java | 6 +- .../xml/MetadataDocumentXmlSerializerTest.java | 4 +- .../processor/TechnicalActionProcessor.java | 46 +-- .../processor/TechnicalEntityProcessor.java | 74 ++-- .../TechnicalPrimitiveComplexProcessor.java | 15 +- .../tecsvc/processor/TechnicalProcessor.java | 5 + .../olingo/server/core/ODataHandlerTest.java | 3 +- .../json/AbstractODataDeserializerTest.java | 6 +- .../json/ODataDeserializerDeepInsertTest.java | 24 +- .../ODataDeserializerEntityCollectionTest.java | 31 +- ...ataJsonDeserializerActionParametersTest.java | 5 +- .../json/ODataJsonDeserializerEntityTest.java | 227 ++++++++--- .../json/ODataJsonSerializerTest.java | 251 ++++++++++++- .../serializer/json/ServiceDocumentTest.java | 4 +- .../serializer/xml/MetadataDocumentTest.java | 4 +- .../server/sample/processor/CarsProcessor.java | 21 +- 149 files changed, 2280 insertions(+), 1405 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9998ba67/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java ---------------------------------------------------------------------- diff --cc lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java index aa30323,2aea46f..bfdebe3 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java @@@ -70,13 -76,18 +76,19 @@@ public final class ContentType public static final ContentType APPLICATION_FORM_URLENCODED = new ContentType(APPLICATION, "x-www-form-urlencoded", null); - public static final ContentType MULTIPART_MIXED = new ContentType(MULTIPART, "mixed", null); + public static final ContentType APPLICATION_HTTP = new ContentType(APPLICATION, "http", null); + public static final ContentType MULTIPART_MIXED = new ContentType(MULTIPART, "mixed", null); public static final ContentType MULTIPART_FORM_DATA = new ContentType(MULTIPART, "form-data", null); - public static final String PARAMETER_CHARSET_UTF8 = "charset=utf-8"; - + public static final String PARAMETER_CHARSET = "charset"; + public static final String PARAMETER_IEEE754_COMPATIBLE = "IEEE754Compatible"; + public static final String PARAMETER_ODATA_METADATA = "odata.metadata"; + + public static final String VALUE_ODATA_METADATA_NONE = "none"; + public static final String VALUE_ODATA_METADATA_MINIMAL = "minimal"; + public static final String VALUE_ODATA_METADATA_FULL = "full"; + private final String type; private final String subtype; private final Map<String, String> parameters; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9998ba67/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/ErrorHandler.java ----------------------------------------------------------------------
