[OLINGO-575] Move v4 package content one package up
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/109c33ba Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/109c33ba Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/109c33ba Branch: refs/heads/master Commit: 109c33ba3950b461bc62e5f5cef3dce9fcf5a90a Parents: c8865db Author: Christian Amend <[email protected]> Authored: Wed Feb 18 16:33:56 2015 +0100 Committer: Christian Amend <[email protected]> Committed: Wed Feb 18 16:33:56 2015 +0100 ---------------------------------------------------------------------- .../org/apache/olingo/ext/proxy/api/Search.java | 2 +- .../AbstractCollectionInvocationHandler.java | 4 +- ...stractEntityCollectionInvocationHandler.java | 3 +- .../commons/AbstractPersistenceManager.java | 10 +- .../AbstractStructuredInvocationHandler.java | 3 +- .../commons/EntitySetInvocationHandler.java | 2 +- .../olingo/ext/proxy/commons/SearchImpl.java | 7 +- .../olingo/ext/pojogen/V4POJOGenMojo.java | 2 +- .../src/main/resources/service.vm | 4 +- .../fit/proxy/v4/APIBasicDesignTestITCase.java | 3 +- .../olingo/fit/proxy/v4/AbstractTestITCase.java | 2 +- .../proxy/v4/AuthEntityCreateTestITCase.java | 2 +- .../proxy/v4/AuthEntityRetrieveTestITCase.java | 2 +- .../olingo/fit/proxy/v4/ContextTestITCase.java | 3 +- .../fit/proxy/v4/EntityCreateTestITCase.java | 3 +- .../fit/proxy/v4/EntityUpdateTestITCase.java | 2 +- .../fit/proxy/v4/KeyAsSegmentTestITCase.java | 2 +- .../fit/proxy/v4/MediaEntityTestITCase.java | 3 +- ...TransactionalAuthEntityCreateTestITCase.java | 2 +- .../NonTransactionalEntityCreateTestITCase.java | 2 +- .../NonTransactionalEntityUpdateTestITCase.java | 2 +- .../NonTransactionalMediaEntityTestITCase.java | 2 +- .../olingo/fit/proxy/v4/OpenTypeTestITCase.java | 3 +- .../v4/UnauthorizedEntityCreateTestITCase.java | 2 +- .../olingo/fit/proxy/v4/demo/Service.java | 4 +- .../olingo/fit/proxy/v4/opentype/Service.java | 4 +- .../fit/proxy/v4/staticservice/Service.java | 4 +- .../olingo/fit/tecsvc/client/BasicITCase.java | 10 +- .../fit/tecsvc/client/BatchClientITCase.java | 6 +- .../olingo/fit/tecsvc/client/MediaITCase.java | 2 +- .../fit/tecsvc/client/NavigationITCase.java | 2 +- .../tecsvc/client/PrimitiveComplexITCase.java | 2 +- .../olingo/fit/v4/AbstractTestITCase.java | 4 +- .../apache/olingo/fit/v4/AsyncTestITCase.java | 6 +- .../olingo/fit/v4/AuthBatchTestITCase.java | 8 +- .../apache/olingo/fit/v4/BatchTestITCase.java | 12 +- .../fit/v4/BoundOperationInvokeTestITCase.java | 2 +- .../olingo/fit/v4/ConformanceTestITCase.java | 10 +- .../apache/olingo/fit/v4/DeltaTestITCase.java | 2 +- .../olingo/fit/v4/DerivedTypeTestITCase.java | 2 +- .../olingo/fit/v4/EntityRetrieveTestITCase.java | 7 +- .../olingo/fit/v4/EntitySetTestITCase.java | 4 +- .../olingo/fit/v4/EntityUpdateTestITCase.java | 6 +- .../olingo/fit/v4/FilterFactoryTestITCase.java | 6 +- .../olingo/fit/v4/KeyAsSegmentTestITCase.java | 4 +- .../olingo/fit/v4/MediaEntityTestITCase.java | 6 +- .../apache/olingo/fit/v4/OAuth2TestITCase.java | 8 +- .../olingo/fit/v4/OpenTypeTestITCase.java | 2 +- .../olingo/fit/v4/PropertyTestITCase.java | 6 +- .../olingo/fit/v4/PropertyValueTestITCase.java | 2 +- .../olingo/fit/v4/QueryOptionsTestITCase.java | 2 +- .../olingo/fit/v4/SingletonTestITCase.java | 6 +- .../client/api/EdmEnabledODataClient.java | 32 ++ .../apache/olingo/client/api/ODataClient.java | 67 +++ .../request/AsyncBatchRequestWrapper.java | 46 ++ .../request/AsyncRequestFactory.java | 29 ++ .../request/AsyncRequestWrapper.java | 56 +++ .../api/communication/request/ODataRequest.java | 4 +- .../request/batch/BatchRequestFactory.java | 29 ++ .../request/batch/ODataBatchRequest.java | 27 ++ .../request/batch/ODataOutsideUpdate.java | 37 ++ .../request/batch/v4/BatchRequestFactory.java | 30 -- .../request/batch/v4/ODataBatchRequest.java | 29 -- .../request/batch/v4/ODataOutsideUpdate.java | 38 -- .../request/cud/CUDRequestFactory.java | 56 +++ .../cud/ODataReferenceAddingRequest.java | 38 ++ .../communication/request/cud/UpdateType.java | 52 +++ .../request/cud/v4/CUDRequestFactory.java | 58 --- .../cud/v4/ODataReferenceAddingRequest.java | 38 -- .../request/cud/v4/UpdateType.java | 53 --- .../request/retrieve/ODataDeltaRequest.java | 27 ++ .../retrieve/RetrieveRequestFactory.java | 46 ++ .../request/retrieve/v4/ODataDeltaRequest.java | 28 -- .../retrieve/v4/RetrieveRequestFactory.java | 51 --- .../request/v4/AsyncBatchRequestWrapper.java | 47 -- .../request/v4/AsyncRequestFactory.java | 30 -- .../request/v4/AsyncRequestWrapper.java | 56 --- .../communication/response/AsyncResponse.java | 23 + .../response/AsyncResponseWrapper.java | 78 ++++ .../response/ODataReferenceAddingResponse.java | 31 ++ .../response/v4/AsyncResponse.java | 24 -- .../response/v4/AsyncResponseWrapper.java | 81 ---- .../v4/ODataReferenceAddingResponse.java | 32 -- .../olingo/client/api/edm/xml/Action.java | 35 ++ .../olingo/client/api/edm/xml/ActionImport.java | 25 ++ .../olingo/client/api/edm/xml/Annotatable.java | 26 ++ .../olingo/client/api/edm/xml/Annotation.java | 30 ++ .../olingo/client/api/edm/xml/Annotations.java | 25 ++ .../client/api/edm/xml/BindingTarget.java | 26 ++ .../olingo/client/api/edm/xml/ComplexType.java | 16 +- .../olingo/client/api/edm/xml/DataServices.java | 2 +- .../apache/olingo/client/api/edm/xml/Edmx.java | 18 +- .../client/api/edm/xml/EntityContainer.java | 20 +- .../olingo/client/api/edm/xml/EntitySet.java | 4 +- .../olingo/client/api/edm/xml/Function.java | 25 ++ .../client/api/edm/xml/FunctionImport.java | 27 ++ .../olingo/client/api/edm/xml/Include.java | 26 ++ .../client/api/edm/xml/IncludeAnnotations.java | 28 ++ .../client/api/edm/xml/NavigationProperty.java | 35 ++ .../api/edm/xml/NavigationPropertyBinding.java | 27 ++ .../client/api/edm/xml/OperationImport.java | 27 ++ .../olingo/client/api/edm/xml/Parameter.java | 26 ++ .../olingo/client/api/edm/xml/Property.java | 24 ++ .../olingo/client/api/edm/xml/Reference.java | 31 ++ .../api/edm/xml/ReferentialConstraint.java | 28 ++ .../olingo/client/api/edm/xml/ReturnType.java | 36 ++ .../olingo/client/api/edm/xml/Schema.java | 61 ++- .../olingo/client/api/edm/xml/Singleton.java | 24 ++ .../apache/olingo/client/api/edm/xml/Term.java | 44 ++ .../client/api/edm/xml/TypeDefinition.java | 40 ++ .../olingo/client/api/edm/xml/XMLMetadata.java | 4 +- .../xml/annotation/AnnotationExpression.java | 30 ++ .../api/edm/xml/annotation/AnnotationPath.java | 25 ++ .../client/api/edm/xml/annotation/Apply.java | 30 ++ .../client/api/edm/xml/annotation/Cast.java | 38 ++ .../api/edm/xml/annotation/Collection.java | 27 ++ .../ConstantAnnotationExpression.java | 56 +++ .../annotation/DynamicAnnotationExpression.java | 91 ++++ .../client/api/edm/xml/annotation/If.java | 31 ++ .../client/api/edm/xml/annotation/IsOf.java | 38 ++ .../api/edm/xml/annotation/LabeledElement.java | 29 ++ .../xml/annotation/LabeledElementReference.java | 25 ++ .../xml/annotation/NavigationPropertyPath.java | 25 ++ .../client/api/edm/xml/annotation/Not.java | 24 ++ .../client/api/edm/xml/annotation/Null.java | 25 ++ .../client/api/edm/xml/annotation/Path.java | 25 ++ .../api/edm/xml/annotation/PropertyPath.java | 25 ++ .../api/edm/xml/annotation/PropertyValue.java | 29 ++ .../client/api/edm/xml/annotation/Record.java | 31 ++ .../TwoParamsOpDynamicAnnotationExpression.java | 50 +++ .../client/api/edm/xml/annotation/UrlRef.java | 25 ++ .../olingo/client/api/edm/xml/v4/Action.java | 37 -- .../client/api/edm/xml/v4/ActionImport.java | 24 -- .../client/api/edm/xml/v4/Annotatable.java | 26 -- .../client/api/edm/xml/v4/Annotation.java | 30 -- .../client/api/edm/xml/v4/Annotations.java | 26 -- .../client/api/edm/xml/v4/BindingTarget.java | 28 -- .../client/api/edm/xml/v4/ComplexType.java | 43 -- .../olingo/client/api/edm/xml/v4/Edmx.java | 26 -- .../client/api/edm/xml/v4/EntityContainer.java | 49 --- .../olingo/client/api/edm/xml/v4/EntitySet.java | 24 -- .../client/api/edm/xml/v4/EntityType.java | 23 - .../olingo/client/api/edm/xml/v4/Function.java | 24 -- .../client/api/edm/xml/v4/FunctionImport.java | 28 -- .../olingo/client/api/edm/xml/v4/Include.java | 26 -- .../api/edm/xml/v4/IncludeAnnotations.java | 28 -- .../api/edm/xml/v4/NavigationProperty.java | 38 -- .../edm/xml/v4/NavigationPropertyBinding.java | 27 -- .../client/api/edm/xml/v4/OperationImport.java | 28 -- .../olingo/client/api/edm/xml/v4/Parameter.java | 27 -- .../olingo/client/api/edm/xml/v4/Property.java | 25 -- .../olingo/client/api/edm/xml/v4/Reference.java | 31 -- .../api/edm/xml/v4/ReferentialConstraint.java | 27 -- .../client/api/edm/xml/v4/ReturnType.java | 36 -- .../olingo/client/api/edm/xml/v4/Schema.java | 69 --- .../olingo/client/api/edm/xml/v4/Singleton.java | 25 -- .../olingo/client/api/edm/xml/v4/Term.java | 45 -- .../client/api/edm/xml/v4/TypeDefinition.java | 41 -- .../client/api/edm/xml/v4/XMLMetadata.java | 36 -- .../xml/v4/annotation/AnnotationExpression.java | 30 -- .../edm/xml/v4/annotation/AnnotationPath.java | 25 -- .../client/api/edm/xml/v4/annotation/Apply.java | 30 -- .../client/api/edm/xml/v4/annotation/Cast.java | 38 -- .../api/edm/xml/v4/annotation/Collection.java | 27 -- .../ConstantAnnotationExpression.java | 56 --- .../annotation/DynamicAnnotationExpression.java | 91 ---- .../client/api/edm/xml/v4/annotation/If.java | 31 -- .../client/api/edm/xml/v4/annotation/IsOf.java | 38 -- .../edm/xml/v4/annotation/LabeledElement.java | 29 -- .../v4/annotation/LabeledElementReference.java | 25 -- .../v4/annotation/NavigationPropertyPath.java | 25 -- .../client/api/edm/xml/v4/annotation/Not.java | 24 -- .../client/api/edm/xml/v4/annotation/Null.java | 25 -- .../client/api/edm/xml/v4/annotation/Path.java | 25 -- .../api/edm/xml/v4/annotation/PropertyPath.java | 25 -- .../edm/xml/v4/annotation/PropertyValue.java | 29 -- .../api/edm/xml/v4/annotation/Record.java | 31 -- .../TwoParamsOpDynamicAnnotationExpression.java | 50 --- .../api/edm/xml/v4/annotation/UrlRef.java | 25 -- .../client/api/serialization/ODataBinder.java | 43 ++ .../api/serialization/ODataDeserializer.java | 41 ++ .../client/api/serialization/ODataReader.java | 39 ++ .../api/serialization/v4/ODataBinder.java | 44 -- .../api/serialization/v4/ODataDeserializer.java | 42 -- .../api/serialization/v4/ODataReader.java | 40 -- .../olingo/client/api/uri/FilterArgFactory.java | 56 +++ .../olingo/client/api/uri/FilterFactory.java | 32 ++ .../olingo/client/api/uri/SearchFactory.java | 31 ++ .../olingo/client/api/uri/URIBuilder.java | 143 ++++++ .../apache/olingo/client/api/uri/URISearch.java | 32 ++ .../client/api/uri/v4/FilterArgFactory.java | 59 --- .../olingo/client/api/uri/v4/FilterFactory.java | 35 -- .../olingo/client/api/uri/v4/SearchFactory.java | 31 -- .../olingo/client/api/uri/v4/URIBuilder.java | 145 ------- .../olingo/client/api/uri/v4/URISearch.java | 32 -- .../client/api/v4/EdmEnabledODataClient.java | 33 -- .../olingo/client/api/v4/ODataClient.java | 68 --- .../apache/olingo/client/core/AndSearch.java | 42 ++ .../client/core/EdmEnabledODataClientImpl.java | 86 ++++ .../olingo/client/core/LiteralSearch.java | 35 ++ .../apache/olingo/client/core/NotSearch.java | 35 ++ .../olingo/client/core/ODataClientFactory.java | 7 +- .../olingo/client/core/ODataClientImpl.java | 156 +++++++ .../org/apache/olingo/client/core/OrSearch.java | 42 ++ .../olingo/client/core/SearchFactoryImpl.java | 46 ++ .../request/AbstractODataRequest.java | 4 +- .../request/AsyncBatchRequestWrapperImpl.java | 119 +++++ .../request/AsyncRequestException.java | 28 ++ .../request/AsyncRequestFactoryImpl.java | 46 ++ .../request/AsyncRequestWrapperImpl.java | 314 ++++++++++++++ .../request/batch/BatchRequestFactoryImpl.java | 37 ++ .../request/batch/ODataBatchRequestImpl.java | 120 ++++++ .../batch/ODataChangesetResponseItem.java | 2 +- .../request/batch/ODataSingleResponseItem.java | 2 +- .../batch/v4/BatchRequestFactoryImpl.java | 38 -- .../request/batch/v4/ODataBatchRequestImpl.java | 122 ------ .../request/cud/CUDRequestFactoryImpl.java | 69 +++ .../cud/ODataReferenceAddingRequestImpl.java | 103 +++++ .../request/cud/v4/CUDRequestFactoryImpl.java | 70 --- .../cud/v4/ODataReferenceAddingRequestImpl.java | 103 ----- .../invoke/AbstractODataInvokeRequest.java | 2 +- .../EdmEnabledInvokeRequestFactoryImpl.java | 51 +++ .../invoke/InvokeRequestFactoryImpl.java | 50 +++ .../request/invoke/ODataInvokeRequestImpl.java | 48 +++ .../v4/EdmEnabledInvokeRequestFactoryImpl.java | 52 --- .../invoke/v4/InvokeRequestFactoryImpl.java | 51 --- .../invoke/v4/ODataInvokeRequestImpl.java | 49 --- .../request/retrieve/ODataDeltaRequestImpl.java | 86 ++++ .../retrieve/RetrieveRequestFactoryImpl.java | 78 ++++ .../retrieve/XMLMetadataRequestImpl.java | 195 +++++++++ .../retrieve/v4/ODataDeltaRequestImpl.java | 87 ---- .../retrieve/v4/RetrieveRequestFactoryImpl.java | 83 ---- .../retrieve/v4/XMLMetadataRequestImpl.java | 196 --------- .../v4/AsyncBatchRequestWrapperImpl.java | 119 ----- .../request/v4/AsyncRequestException.java | 28 -- .../request/v4/AsyncRequestFactoryImpl.java | 46 -- .../request/v4/AsyncRequestWrapperImpl.java | 316 -------------- .../response/AsyncResponseImpl.java | 65 +++ .../response/v4/AsyncResponseImpl.java | 66 --- .../olingo/client/core/edm/EdmActionImpl.java | 2 +- .../client/core/edm/EdmActionImportImpl.java | 2 +- .../core/edm/EdmAnnotationHelperImpl.java | 4 +- .../client/core/edm/EdmAnnotationImpl.java | 18 +- .../client/core/edm/EdmAnnotationsImpl.java | 4 +- .../client/core/edm/EdmBindingTargetImpl.java | 4 +- .../olingo/client/core/edm/EdmClientImpl.java | 50 +-- .../client/core/edm/EdmComplexTypeImpl.java | 8 +- .../client/core/edm/EdmEntityContainerImpl.java | 38 +- .../client/core/edm/EdmEntitySetImpl.java | 2 +- .../client/core/edm/EdmEntityTypeImpl.java | 4 +- .../olingo/client/core/edm/EdmFunctionImpl.java | 2 +- .../client/core/edm/EdmFunctionImportImpl.java | 2 +- .../olingo/client/core/edm/EdmMemberImpl.java | 2 +- .../core/edm/EdmNavigationPropertyImpl.java | 4 +- .../client/core/edm/EdmOperationImpl.java | 2 +- .../client/core/edm/EdmParameterImpl.java | 2 +- .../olingo/client/core/edm/EdmPropertyImpl.java | 2 +- .../core/edm/EdmReferentialConstraintImpl.java | 2 +- .../client/core/edm/EdmReturnTypeImpl.java | 2 +- .../olingo/client/core/edm/EdmSchemaImpl.java | 38 +- .../client/core/edm/EdmSingletonImpl.java | 2 +- .../core/edm/EdmStructuredTypeHelperImpl.java | 12 +- .../olingo/client/core/edm/EdmTermImpl.java | 2 +- .../client/core/edm/EdmTypeDefinitionImpl.java | 2 +- .../client/core/edm/annotation/EdmCastImpl.java | 80 ++++ .../EdmConstantAnnotationExpressionImpl.java | 141 ++++++ .../client/core/edm/annotation/EdmIsOfImpl.java | 80 ++++ .../core/edm/annotation/EdmRecordImpl.java | 55 +++ .../core/edm/v4/annotation/EdmCastImpl.java | 80 ---- .../EdmConstantAnnotationExpressionImpl.java | 141 ------ .../core/edm/v4/annotation/EdmIsOfImpl.java | 80 ---- .../core/edm/v4/annotation/EdmRecordImpl.java | 55 --- .../core/edm/xml/AbstractAnnotatable.java | 38 ++ .../core/edm/xml/AbstractComplexType.java | 10 +- .../core/edm/xml/AbstractEdmDeserializer.java | 3 +- .../core/edm/xml/AbstractEntityContainer.java | 8 +- .../core/edm/xml/AbstractXMLMetadata.java | 4 +- .../client/core/edm/xml/ActionDeserializer.java | 61 +++ .../olingo/client/core/edm/xml/ActionImpl.java | 91 ++++ .../client/core/edm/xml/ActionImportImpl.java | 66 +++ .../core/edm/xml/AnnotationDeserializer.java | 61 +++ .../client/core/edm/xml/AnnotationImpl.java | 64 +++ .../core/edm/xml/AnnotationsDeserializer.java | 53 +++ .../client/core/edm/xml/AnnotationsImpl.java | 51 +++ .../core/edm/xml/ComplexTypeDeserializer.java | 4 - .../client/core/edm/xml/ComplexTypeImpl.java | 97 +++++ .../core/edm/xml/DataServicesDeserializer.java | 3 - .../client/core/edm/xml/DataServicesImpl.java | 37 ++ .../client/core/edm/xml/EdmxDeserializer.java | 10 +- .../olingo/client/core/edm/xml/EdmxImpl.java | 43 ++ .../edm/xml/EntityContainerDeserializer.java | 19 +- .../core/edm/xml/EntityContainerImpl.java | 123 ++++++ .../core/edm/xml/EntitySetDeserializer.java | 10 +- .../client/core/edm/xml/EntitySetImpl.java | 57 +++ .../core/edm/xml/EntityTypeDeserializer.java | 13 +- .../client/core/edm/xml/EntityTypeImpl.java | 64 +++ .../core/edm/xml/EnumTypeDeserializer.java | 9 +- .../client/core/edm/xml/EnumTypeImpl.java | 38 ++ .../core/edm/xml/FunctionDeserializer.java | 63 +++ .../client/core/edm/xml/FunctionImpl.java | 41 ++ .../edm/xml/FunctionImportDeserializer.java | 58 +++ .../client/core/edm/xml/FunctionImportImpl.java | 86 ++++ .../core/edm/xml/IncludeAnnotationsImpl.java | 65 +++ .../olingo/client/core/edm/xml/IncludeImpl.java | 53 +++ .../olingo/client/core/edm/xml/MemberImpl.java | 38 ++ .../edm/xml/NavigationPropertyBindingImpl.java | 53 +++ .../edm/xml/NavigationPropertyDeserializer.java | 67 +++ .../core/edm/xml/NavigationPropertyImpl.java | 94 ++++ .../core/edm/xml/ParameterDeserializer.java | 7 +- .../client/core/edm/xml/ParameterImpl.java | 50 +++ .../core/edm/xml/PropertyDeserializer.java | 5 +- .../client/core/edm/xml/PropertyImpl.java | 37 ++ .../core/edm/xml/ReferenceDeserializer.java | 58 +++ .../client/core/edm/xml/ReferenceImpl.java | 61 +++ .../core/edm/xml/ReferentialConstraintImpl.java | 53 +++ .../core/edm/xml/ReturnTypeDeserializer.java | 66 +++ .../client/core/edm/xml/ReturnTypeImpl.java | 97 +++++ .../client/core/edm/xml/SchemaDeserializer.java | 40 +- .../olingo/client/core/edm/xml/SchemaImpl.java | 248 +++++++++++ .../core/edm/xml/SingletonDeserializer.java | 57 +++ .../client/core/edm/xml/SingletonImpl.java | 69 +++ .../client/core/edm/xml/TermDeserializer.java | 79 ++++ .../olingo/client/core/edm/xml/TermImpl.java | 140 ++++++ .../edm/xml/TypeDefinitionDeserializer.java | 70 +++ .../client/core/edm/xml/TypeDefinitionImpl.java | 119 +++++ .../client/core/edm/xml/XMLMetadataImpl.java | 56 +++ ...tAnnotatableDynamicAnnotationExpression.java | 38 ++ .../AbstractAnnotationExpression.java | 49 +++ .../AbstractDynamicAnnotationExpression.java | 218 ++++++++++ .../AbstractElementOrAttributeExpression.java | 37 ++ .../edm/xml/annotation/AnnotationPathImpl.java | 27 ++ .../edm/xml/annotation/ApplyDeserializer.java | 57 +++ .../core/edm/xml/annotation/ApplyImpl.java | 52 +++ .../edm/xml/annotation/CastDeserializer.java | 69 +++ .../core/edm/xml/annotation/CastImpl.java | 98 +++++ .../xml/annotation/CollectionDeserializer.java | 52 +++ .../core/edm/xml/annotation/CollectionImpl.java | 41 ++ .../ConstantAnnotationExpressionImpl.java | 52 +++ ...DynamicAnnotationExpressionDeserializer.java | 175 ++++++++ .../client/core/edm/xml/annotation/IfImpl.java | 61 +++ .../edm/xml/annotation/IsOfDeserializer.java | 69 +++ .../core/edm/xml/annotation/IsOfImpl.java | 98 +++++ .../annotation/LabeledElementDeserializer.java | 55 +++ .../edm/xml/annotation/LabeledElementImpl.java | 54 +++ .../annotation/LabeledElementReferenceImpl.java | 28 ++ .../annotation/NavigationPropertyPathImpl.java | 27 ++ .../client/core/edm/xml/annotation/NotImpl.java | 39 ++ .../edm/xml/annotation/NullDeserializer.java | 51 +++ .../core/edm/xml/annotation/NullImpl.java | 30 ++ .../core/edm/xml/annotation/PathImpl.java | 27 ++ .../edm/xml/annotation/PropertyPathImpl.java | 27 ++ .../annotation/PropertyValueDeserializer.java | 57 +++ .../edm/xml/annotation/PropertyValueImpl.java | 53 +++ .../edm/xml/annotation/RecordDeserializer.java | 55 +++ .../core/edm/xml/annotation/RecordImpl.java | 52 +++ ...ParamsOpDynamicAnnotationExpressionImpl.java | 62 +++ .../edm/xml/annotation/UrlRefDeserializer.java | 52 +++ .../core/edm/xml/annotation/UrlRefImpl.java | 42 ++ .../core/edm/xml/v4/AbstractAnnotatable.java | 39 -- .../core/edm/xml/v4/ActionDeserializer.java | 62 --- .../client/core/edm/xml/v4/ActionImpl.java | 91 ---- .../core/edm/xml/v4/ActionImportImpl.java | 66 --- .../core/edm/xml/v4/AnnotationDeserializer.java | 62 --- .../client/core/edm/xml/v4/AnnotationImpl.java | 64 --- .../edm/xml/v4/AnnotationsDeserializer.java | 55 --- .../client/core/edm/xml/v4/AnnotationsImpl.java | 52 --- .../client/core/edm/xml/v4/ComplexTypeImpl.java | 98 ----- .../core/edm/xml/v4/DataServicesImpl.java | 38 -- .../olingo/client/core/edm/xml/v4/EdmxImpl.java | 44 -- .../core/edm/xml/v4/EntityContainerImpl.java | 124 ------ .../client/core/edm/xml/v4/EntitySetImpl.java | 58 --- .../client/core/edm/xml/v4/EntityTypeImpl.java | 65 --- .../client/core/edm/xml/v4/EnumTypeImpl.java | 39 -- .../core/edm/xml/v4/FunctionDeserializer.java | 64 --- .../client/core/edm/xml/v4/FunctionImpl.java | 41 -- .../edm/xml/v4/FunctionImportDeserializer.java | 59 --- .../core/edm/xml/v4/FunctionImportImpl.java | 86 ---- .../core/edm/xml/v4/IncludeAnnotationsImpl.java | 66 --- .../client/core/edm/xml/v4/IncludeImpl.java | 54 --- .../client/core/edm/xml/v4/MemberImpl.java | 39 -- .../xml/v4/NavigationPropertyBindingImpl.java | 54 --- .../xml/v4/NavigationPropertyDeserializer.java | 69 --- .../core/edm/xml/v4/NavigationPropertyImpl.java | 95 ---- .../client/core/edm/xml/v4/ParameterImpl.java | 51 --- .../client/core/edm/xml/v4/PropertyImpl.java | 38 -- .../core/edm/xml/v4/ReferenceDeserializer.java | 60 --- .../client/core/edm/xml/v4/ReferenceImpl.java | 61 --- .../edm/xml/v4/ReferentialConstraintImpl.java | 53 --- .../core/edm/xml/v4/ReturnTypeDeserializer.java | 67 --- .../client/core/edm/xml/v4/ReturnTypeImpl.java | 98 ----- .../client/core/edm/xml/v4/SchemaImpl.java | 249 ----------- .../core/edm/xml/v4/SingletonDeserializer.java | 59 --- .../client/core/edm/xml/v4/SingletonImpl.java | 63 --- .../core/edm/xml/v4/TermDeserializer.java | 80 ---- .../olingo/client/core/edm/xml/v4/TermImpl.java | 140 ------ .../edm/xml/v4/TypeDefinitionDeserializer.java | 71 --- .../core/edm/xml/v4/TypeDefinitionImpl.java | 120 ------ .../client/core/edm/xml/v4/XMLMetadataImpl.java | 57 --- ...tAnnotatableDynamicAnnotationExpression.java | 38 -- .../AbstractAnnotationExpression.java | 49 --- .../AbstractDynamicAnnotationExpression.java | 218 ---------- .../AbstractElementOrAttributeExpression.java | 37 -- .../xml/v4/annotation/AnnotationPathImpl.java | 27 -- .../xml/v4/annotation/ApplyDeserializer.java | 57 --- .../core/edm/xml/v4/annotation/ApplyImpl.java | 52 --- .../edm/xml/v4/annotation/CastDeserializer.java | 69 --- .../core/edm/xml/v4/annotation/CastImpl.java | 98 ----- .../v4/annotation/CollectionDeserializer.java | 52 --- .../edm/xml/v4/annotation/CollectionImpl.java | 41 -- .../ConstantAnnotationExpressionImpl.java | 52 --- ...DynamicAnnotationExpressionDeserializer.java | 175 -------- .../core/edm/xml/v4/annotation/IfImpl.java | 61 --- .../edm/xml/v4/annotation/IsOfDeserializer.java | 69 --- .../core/edm/xml/v4/annotation/IsOfImpl.java | 98 ----- .../annotation/LabeledElementDeserializer.java | 55 --- .../xml/v4/annotation/LabeledElementImpl.java | 54 --- .../annotation/LabeledElementReferenceImpl.java | 28 -- .../annotation/NavigationPropertyPathImpl.java | 27 -- .../core/edm/xml/v4/annotation/NotImpl.java | 39 -- .../edm/xml/v4/annotation/NullDeserializer.java | 51 --- .../core/edm/xml/v4/annotation/NullImpl.java | 30 -- .../core/edm/xml/v4/annotation/PathImpl.java | 27 -- .../edm/xml/v4/annotation/PropertyPathImpl.java | 27 -- .../annotation/PropertyValueDeserializer.java | 57 --- .../xml/v4/annotation/PropertyValueImpl.java | 53 --- .../xml/v4/annotation/RecordDeserializer.java | 55 --- .../core/edm/xml/v4/annotation/RecordImpl.java | 52 --- ...ParamsOpDynamicAnnotationExpressionImpl.java | 62 --- .../xml/v4/annotation/UrlRefDeserializer.java | 52 --- .../core/edm/xml/v4/annotation/UrlRefImpl.java | 42 -- .../core/serialization/AbstractODataBinder.java | 2 +- .../core/serialization/ODataBinderImpl.java | 430 ++++++++++++++++++ .../serialization/ODataDeserializerImpl.java | 78 ++++ .../core/serialization/ODataReaderImpl.java | 54 +++ .../core/serialization/v4/ODataBinderImpl.java | 431 ------------------- .../serialization/v4/ODataDeserializerImpl.java | 79 ---- .../core/serialization/v4/ODataReaderImpl.java | 55 --- .../client/core/uri/FilterArgFactoryImpl.java | 112 +++++ .../client/core/uri/FilterFactoryImpl.java | 49 +++ .../olingo/client/core/uri/URIBuilderImpl.java | 144 +++++++ .../core/uri/v4/FilterArgFactoryImpl.java | 115 ----- .../client/core/uri/v4/FilterFactoryImpl.java | 52 --- .../client/core/uri/v4/URIBuilderImpl.java | 145 ------- .../apache/olingo/client/core/v4/AndSearch.java | 42 -- .../core/v4/EdmEnabledODataClientImpl.java | 86 ---- .../olingo/client/core/v4/LiteralSearch.java | 35 -- .../apache/olingo/client/core/v4/NotSearch.java | 35 -- .../olingo/client/core/v4/ODataClientImpl.java | 157 ------- .../apache/olingo/client/core/v4/OrSearch.java | 42 -- .../client/core/v4/SearchFactoryImpl.java | 46 -- .../apache/olingo/client/core/AbstractTest.java | 2 +- .../olingo/client/core/uri/URIEscapeTest.java | 2 +- .../client/core/uri/v4/FilterFactoryTest.java | 8 +- .../client/core/uri/v4/URIBuilderTest.java | 4 +- .../apache/olingo/client/core/v4/AtomTest.java | 4 +- .../olingo/client/core/v4/EntitySetTest.java | 2 +- .../olingo/client/core/v4/EntityTest.java | 6 +- .../apache/olingo/client/core/v4/ErrorTest.java | 2 +- .../apache/olingo/client/core/v4/JSONTest.java | 4 +- .../olingo/client/core/v4/MetadataTest.java | 42 +- .../client/core/v4/PrimitiveValueTest.java | 2 +- .../olingo/client/core/v4/PropertyTest.java | 2 +- .../client/core/v4/ServiceDocumentTest.java | 2 +- 463 files changed, 10600 insertions(+), 10940 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java index 2359653..75e6eb3 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.ext.proxy.api; -import org.apache.olingo.client.api.uri.v4.URISearch; +import org.apache.olingo.client.api.uri.URISearch; import java.io.Serializable; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java index 073ccb3..9566236 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java @@ -19,6 +19,7 @@ package org.apache.olingo.ext.proxy.commons; import java.io.Serializable; + import org.apache.olingo.client.api.uri.CommonURIBuilder; import java.lang.reflect.Proxy; @@ -31,11 +32,12 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.Future; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Triple; import org.apache.olingo.client.api.uri.QueryOption; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.api.uri.URIFilter; -import org.apache.olingo.client.api.uri.v4.URIBuilder; import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java index 92f4d4a..c519614 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java @@ -20,10 +20,10 @@ package org.apache.olingo.ext.proxy.commons; import org.apache.commons.lang3.tuple.ImmutableTriple; import org.apache.commons.lang3.tuple.Triple; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.uri.CommonURIBuilder; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataEntitySet; import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; @@ -37,6 +37,7 @@ import java.lang.reflect.Type; import java.net.URI; import java.util.ArrayList; import java.util.List; + import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.EntityType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java index f72945a..7bed3af 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java @@ -32,13 +32,13 @@ import java.util.concurrent.Callable; import java.util.concurrent.Future; import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.api.communication.header.ODataPreferences; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; -import org.apache.olingo.client.api.communication.request.cud.v4.ODataReferenceAddingRequest; +import org.apache.olingo.client.api.communication.request.cud.ODataReferenceAddingRequest; import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.domain.CommonODataEntity; @@ -465,7 +465,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager { final ODataEntityUpdateRequest<CommonODataEntity> req = ((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). getEntityUpdateRequest(handler.getEntityURI(), - org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); + org.apache.olingo.client.api.communication.request.cud.UpdateType.PATCH, changes); req.setPrefer(new ODataPreferences(service.getClient().getServiceVersion()).returnContent()); @@ -487,7 +487,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager { if (service.getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) >= 1) { final ODataReferenceAddingRequest req = - ((org.apache.olingo.client.api.v4.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). + ((org.apache.olingo.client.api.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). getReferenceAddingRequest(sericeRoot, source, targetRef); req.setPrefer(new ODataPreferences(service.getClient().getServiceVersion()).returnContent()); @@ -517,7 +517,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager { final ODataEntityUpdateRequest<CommonODataEntity> req = ((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory(). getEntityUpdateRequest(uri, - org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes); + org.apache.olingo.client.api.communication.request.cud.UpdateType.PATCH, changes); req.setPrefer(new ODataPreferences(service.getClient().getServiceVersion()).returnContent()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java index aaae42c..ca080a3 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java @@ -34,12 +34,13 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.QueryOption; -import org.apache.olingo.client.api.uri.v4.URIBuilder; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataProperty; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java index b61c4cc..83f2e23 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java @@ -28,9 +28,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.Future; import org.apache.commons.lang3.tuple.Triple; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; import org.apache.olingo.client.api.uri.CommonURIBuilder; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; import org.apache.olingo.commons.api.edm.FullQualifiedName; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java index 7956226..5deceac 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java @@ -19,10 +19,11 @@ package org.apache.olingo.ext.proxy.commons; import java.net.URI; + import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.uri.v4.URIBuilder; -import org.apache.olingo.client.api.uri.v4.URISearch; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; +import org.apache.olingo.client.api.uri.URIBuilder; +import org.apache.olingo.client.api.uri.URISearch; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.ext.proxy.api.EntityCollection; import org.apache.olingo.ext.proxy.api.EntityType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V4POJOGenMojo.java ---------------------------------------------------------------------- diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V4POJOGenMojo.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V4POJOGenMojo.java index 13d97b7..dd85277 100644 --- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V4POJOGenMojo.java +++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V4POJOGenMojo.java @@ -20,7 +20,7 @@ package org.apache.olingo.ext.pojogen; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; -import org.apache.olingo.client.api.v4.ODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmSchema; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/ext/pojogen-maven-plugin/src/main/resources/service.vm ---------------------------------------------------------------------- diff --git a/ext/pojogen-maven-plugin/src/main/resources/service.vm b/ext/pojogen-maven-plugin/src/main/resources/service.vm index 2d43e58..292ba8f 100644 --- a/ext/pojogen-maven-plugin/src/main/resources/service.vm +++ b/ext/pojogen-maven-plugin/src/main/resources/service.vm @@ -56,7 +56,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS * @param serviceRoot OData service root * @return OData 4.0 instance for given service root, operating in transactions (with batch requests) */ - public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4( + public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4( final String serviceRoot) { return getV4(serviceRoot, true); @@ -69,7 +69,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS * @param transactional whether operating in transactions (with batch requests) or not * @return OData 4.0 instance for given service root */ - public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4( + public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4( final String serviceRoot, final boolean transactional) { return getInstance(ODataServiceVersion.V40, serviceRoot, transactional); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java index f02ba75..9581734 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java @@ -31,10 +31,11 @@ import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Calendar; import java.util.TimeZone; + //CHECKSTYLE:OFF (Maven checkstyle) import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.RandomStringUtils; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.EdmStreamValue; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java index 41c41d0..70b34f5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java @@ -30,7 +30,7 @@ import java.util.Calendar; import java.util.TimeZone; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.PrimitiveCollection; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java index 47d4417..8ff1ddb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.fit.proxy.v4; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.fit.proxy.v4.staticservice.Service; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java index 1b4fede..6eaf4cc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.fit.proxy.v4; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.fit.proxy.v4.staticservice.Service; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java index bd3d2b8..feb2b0f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java @@ -25,7 +25,8 @@ import static org.junit.Assert.fail; import java.sql.Timestamp; import java.util.Calendar; import java.util.TimeZone; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; + +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.api.ODataFlushException; import org.apache.olingo.ext.proxy.api.PrimitiveCollection; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java index aaff867..63c88e5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java @@ -20,7 +20,7 @@ package org.apache.olingo.fit.proxy.v4; //CHECKSTYLE:OFF (Maven checkstyle) import org.apache.commons.lang3.RandomUtils; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; @@ -44,6 +44,7 @@ import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Calendar; import java.util.TimeZone; + import org.apache.olingo.ext.proxy.api.PrimitiveCollection; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java index 863d041..6be75de 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java @@ -21,7 +21,7 @@ package org.apache.olingo.fit.proxy.v4; //CHECKSTYLE:OFF (Maven checkstyle) import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java index 5e546bf..9ca25a9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java @@ -21,7 +21,7 @@ package org.apache.olingo.fit.proxy.v4; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.fit.proxy.v4.staticservice.Service; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java index c268f30..26d1257 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java @@ -27,9 +27,10 @@ import java.io.IOException; import java.sql.Timestamp; import java.util.Calendar; import java.util.UUID; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.RandomStringUtils; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.api.EdmStreamValue; import org.apache.olingo.fit.proxy.v4.demo.Service; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java index dbb5101..7422389 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.fit.proxy.v4; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.fit.proxy.v4.staticservice.Service; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java index 46f236b..df22b7c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.fit.proxy.v4; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.fit.proxy.v4.staticservice.Service; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java index ccb070c..4202043 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.fit.proxy.v4; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.fit.proxy.v4.staticservice.Service; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java index 696532a..43068dc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.fit.proxy.v4; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.fit.proxy.v4.demo.Service; import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java index 082331e..192a2aa 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java @@ -29,7 +29,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.UUID; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; + +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.api.annotations.EntityType; import org.apache.olingo.fit.proxy.v4.opentype.Service; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java index cfc116e..a97dc72 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.fit.proxy.v4; +import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.api.http.HttpClientException; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.fit.proxy.v4.staticservice.Service; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Service.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Service.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Service.java index 116a756..8f13726 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Service.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Service.java @@ -54,7 +54,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS * @param serviceRoot OData service root * @return OData 4.0 instance for given service root, operating in transactions (with batch requests) */ - public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4( + public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4( final String serviceRoot) { return getV4(serviceRoot, true); @@ -67,7 +67,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS * @param transactional whether operating in transactions (with batch requests) or not * @return OData 4.0 instance for given service root */ - public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4( + public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4( final String serviceRoot, final boolean transactional) { return getInstance(ODataServiceVersion.V40, serviceRoot, transactional); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/Service.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/Service.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/Service.java index dbdfd96..1b1a0ba 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/Service.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/Service.java @@ -55,7 +55,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS * @param serviceRoot OData service root * @return OData 4.0 instance for given service root, operating in transactions (with batch requests) */ - public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4( + public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4( final String serviceRoot) { return getV4(serviceRoot, true); @@ -68,7 +68,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS * @param transactional whether operating in transactions (with batch requests) or not * @return OData 4.0 instance for given service root */ - public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4( + public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4( final String serviceRoot, final boolean transactional) { return getInstance(ODataServiceVersion.V40, serviceRoot, transactional); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/Service.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/Service.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/Service.java index 05b7dc8..1fbc53f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/Service.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/Service.java @@ -55,7 +55,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS * @param serviceRoot OData service root * @return OData 4.0 instance for given service root, operating in transactions (with batch requests) */ - public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4( + public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4( final String serviceRoot) { return getV4(serviceRoot, true); @@ -68,7 +68,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS * @param transactional whether operating in transactions (with batch requests) or not * @return OData 4.0 instance for given service root */ - public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4( + public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4( final String serviceRoot, final boolean transactional) { return getInstance(ODataServiceVersion.V40, serviceRoot, transactional); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java index 17a0e29..f8cf05c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java @@ -32,11 +32,12 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; -import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; +import org.apache.olingo.client.api.communication.request.cud.UpdateType; import org.apache.olingo.client.api.communication.request.retrieve.EdmMetadataRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; @@ -46,9 +47,8 @@ import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; +import org.apache.olingo.client.api.edm.xml.Reference; import org.apache.olingo.client.api.edm.xml.XMLMetadata; -import org.apache.olingo.client.api.edm.xml.v4.Reference; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.domain.ODataServiceDocument; @@ -119,11 +119,11 @@ public class BasicITCase extends AbstractBaseTestITCase { XMLMetadata xmlMetadata = response.getBody(); assertNotNull(xmlMetadata); - assertTrue(xmlMetadata instanceof org.apache.olingo.client.api.edm.xml.v4.XMLMetadata); + assertTrue(xmlMetadata instanceof XMLMetadata); assertEquals(2, xmlMetadata.getSchemas().size()); assertEquals("olingo.odata.test1", xmlMetadata.getSchema("olingo.odata.test1").getNamespace()); final List<Reference> references = - ((org.apache.olingo.client.api.edm.xml.v4.XMLMetadata) xmlMetadata).getReferences(); + ((XMLMetadata) xmlMetadata).getReferences(); assertEquals(1, references.size()); assertThat(references.get(0).getUri().toASCIIString(), containsString("vocabularies/Org.OData.Core.V1")); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java index 1152bb0..ef9329f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java @@ -31,19 +31,19 @@ import java.util.Iterator; import org.apache.olingo.client.api.ODataBatchConstants; import org.apache.olingo.client.api.communication.request.batch.BatchManager; +import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest; import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem; import org.apache.olingo.client.api.communication.request.batch.ODataChangeset; -import org.apache.olingo.client.api.communication.request.batch.v4.ODataBatchRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; -import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; +import org.apache.olingo.client.api.communication.request.cud.UpdateType; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataBatchResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.uri.v4.URIBuilder; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.communication.request.batch.ODataChangesetResponseItem; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.domain.v4.ODataEntity; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java index 2e82699..e1a56b9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java @@ -29,6 +29,7 @@ import java.net.URI; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest; @@ -38,7 +39,6 @@ import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataProperty; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java index 0693836..494f273 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java @@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java index 49624ab..80c58ca 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java @@ -29,13 +29,13 @@ import java.net.URI; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.domain.v4.ODataProperty; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java index 6dd1e56..0b091dd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.fit.v4; +import org.apache.olingo.client.api.EdmEnabledODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.v4.ODataEntity; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java index 8a901fa..eef0525 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.fit.v4; +import org.apache.olingo.client.api.communication.request.AsyncRequestWrapper; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; -import org.apache.olingo.client.api.communication.request.v4.AsyncRequestWrapper; +import org.apache.olingo.client.api.communication.response.AsyncResponseWrapper; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper; -import org.apache.olingo.client.api.uri.v4.URIBuilder; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataInlineEntity; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java index 1edcc21..51b86b4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java @@ -18,17 +18,17 @@ */ package org.apache.olingo.fit.v4; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.batch.BatchManager; +import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest; import org.apache.olingo.client.api.communication.request.batch.ODataChangeset; -import org.apache.olingo.client.api.communication.request.batch.v4.ODataBatchRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; -import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; +import org.apache.olingo.client.api.communication.request.cud.UpdateType; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataBatchResponse; import org.apache.olingo.client.api.http.HttpClientException; -import org.apache.olingo.client.api.uri.v4.URIBuilder; -import org.apache.olingo.client.api.v4.ODataClient; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.domain.v4.ODataEntity; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java index 62f0f25..fdec603 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java @@ -21,24 +21,24 @@ package org.apache.olingo.fit.v4; import org.apache.http.HttpResponse; import org.apache.olingo.client.api.ODataBatchConstants; import org.apache.olingo.client.api.communication.header.HeaderName; +import org.apache.olingo.client.api.communication.request.AsyncBatchRequestWrapper; import org.apache.olingo.client.api.communication.request.ODataPayloadManager; import org.apache.olingo.client.api.communication.request.batch.BatchManager; +import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest; import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem; import org.apache.olingo.client.api.communication.request.batch.ODataChangeset; -import org.apache.olingo.client.api.communication.request.batch.v4.ODataBatchRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; -import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; +import org.apache.olingo.client.api.communication.request.cud.UpdateType; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; -import org.apache.olingo.client.api.communication.request.v4.AsyncBatchRequestWrapper; +import org.apache.olingo.client.api.communication.response.AsyncResponse; +import org.apache.olingo.client.api.communication.response.AsyncResponseWrapper; import org.apache.olingo.client.api.communication.response.ODataBatchResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.communication.response.v4.AsyncResponse; -import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper; -import org.apache.olingo.client.api.uri.v4.URIBuilder; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.communication.request.AbstractODataStreamManager; import org.apache.olingo.client.core.communication.request.Wrapper; import org.apache.olingo.client.core.communication.request.batch.ODataChangesetResponseItem; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java index 5be15f7..d81443e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java @@ -20,7 +20,7 @@ package org.apache.olingo.fit.v4; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; -import org.apache.olingo.client.api.uri.v4.URIBuilder; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataComplexValue; import org.apache.olingo.commons.api.domain.ODataOperation; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java index 653c2a1..5260c8f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java @@ -19,21 +19,21 @@ package org.apache.olingo.fit.v4; import org.apache.olingo.client.api.communication.header.HeaderName; +import org.apache.olingo.client.api.communication.request.AsyncRequestWrapper; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; -import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; +import org.apache.olingo.client.api.communication.request.cud.UpdateType; +import org.apache.olingo.client.api.communication.request.retrieve.ODataDeltaRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; -import org.apache.olingo.client.api.communication.request.retrieve.v4.ODataDeltaRequest; -import org.apache.olingo.client.api.communication.request.v4.AsyncRequestWrapper; +import org.apache.olingo.client.api.communication.response.AsyncResponseWrapper; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper; import org.apache.olingo.client.api.uri.CommonURIBuilder; -import org.apache.olingo.client.api.uri.v4.URIBuilder; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.client.core.http.DefaultHttpClientFactory; import org.apache.olingo.client.core.uri.URIUtils; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java index 27093fd..da69f93 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.fit.v4; +import org.apache.olingo.client.api.communication.request.retrieve.ODataDeltaRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; -import org.apache.olingo.client.api.communication.request.retrieve.v4.ODataDeltaRequest; import org.apache.olingo.commons.api.domain.v4.ODataDelta; import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.domain.v4.ODataProperty; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java index 3102802..cc040b6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java @@ -23,7 +23,7 @@ import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateR import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; -import org.apache.olingo.client.api.uri.v4.URIBuilder; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.commons.api.domain.ODataComplexValue; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java index 58e9330..3a25a60 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java @@ -24,13 +24,13 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.client.api.EdmEnabledODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.uri.v4.URIBuilder; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; -import org.apache.olingo.client.api.v4.ODataClient; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataEntitySet; @@ -44,6 +44,7 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; + import java.net.URI; import java.sql.Timestamp; import java.util.LinkedHashMap; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/109c33ba/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java index 4deb265..38f5a85 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.fit.v4; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.uri.v4.URIBuilder; -import org.apache.olingo.client.api.v4.ODataClient; +import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.v4.ODataEntity;
