[OLINGO-564] first step for common -> client extraction
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/17152920 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/17152920 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/17152920 Branch: refs/heads/OLINGO-564 Commit: 17152920f0f3d267db681a1c89be38c3ac67e34c Parents: c37d4da Author: Michael Bolz <[email protected]> Authored: Wed Apr 29 10:04:12 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Thu Apr 30 06:04:42 2015 +0200 ---------------------------------------------------------------------- .../AbstractCollectionInvocationHandler.java | 2 +- ...stractEntityCollectionInvocationHandler.java | 8 +- .../commons/AbstractInvocationHandler.java | 4 +- .../commons/AbstractPersistenceManager.java | 6 +- .../AbstractStructuredInvocationHandler.java | 14 +- .../commons/AnnotatableInvocationHandler.java | 6 +- .../ComplexCollectionInvocationHandler.java | 8 +- .../proxy/commons/ComplexInvocationHandler.java | 6 +- .../EntityContainerInvocationHandler.java | 2 +- .../proxy/commons/EntityInvocationHandler.java | 6 +- .../commons/EntitySetInvocationHandler.java | 4 +- .../ext/proxy/commons/EntitySetIterator.java | 2 +- .../proxy/commons/InvokerInvocationHandler.java | 10 +- .../commons/OperationInvocationHandler.java | 6 +- .../PrimitiveCollectionInvocationHandler.java | 6 +- ...turedComposableInvokerInvocationHandler.java | 2 +- .../ext/proxy/context/EntityLinkDesc.java | 2 +- .../olingo/ext/proxy/utils/CoreUtils.java | 20 +- .../olingo/ext/proxy/utils/ProxyUtils.java | 6 +- .../olingo/fit/AbstractBaseTestITCase.java | 6 +- .../fit/tecsvc/client/ActionImportITCase.java | 12 +- .../olingo/fit/tecsvc/client/BasicITCase.java | 125 ++++---- .../fit/tecsvc/client/BatchClientITCase.java | 6 +- .../olingo/fit/tecsvc/client/BindingITCase.java | 15 +- .../fit/tecsvc/client/DeepInsertITCase.java | 18 +- .../fit/tecsvc/client/ExpandSelectITCase.java | 12 +- .../ExpandWithSystemQueryOptionsITCase.java | 4 +- .../tecsvc/client/FilterSystemQueryITCase.java | 8 +- .../fit/tecsvc/client/FunctionImportITCase.java | 10 +- .../olingo/fit/tecsvc/client/MediaITCase.java | 4 +- .../fit/tecsvc/client/NavigationITCase.java | 6 +- .../tecsvc/client/OrderBySystemQueryITCase.java | 6 +- .../tecsvc/client/PrimitiveComplexITCase.java | 4 +- .../tecsvc/client/SystemQueryOptionITCase.java | 4 +- .../olingo/fit/v4/AbstractTestITCase.java | 10 +- .../apache/olingo/fit/v4/AsyncTestITCase.java | 10 +- .../olingo/fit/v4/AuthBatchTestITCase.java | 2 +- .../apache/olingo/fit/v4/BatchTestITCase.java | 4 +- .../fit/v4/BoundOperationInvokeTestITCase.java | 20 +- .../olingo/fit/v4/ConformanceTestITCase.java | 14 +- .../apache/olingo/fit/v4/DeltaTestITCase.java | 6 +- .../olingo/fit/v4/DerivedTypeTestITCase.java | 8 +- .../olingo/fit/v4/EntityCreateTestITCase.java | 8 +- .../olingo/fit/v4/EntityRetrieveTestITCase.java | 14 +- .../olingo/fit/v4/EntitySetTestITCase.java | 4 +- .../olingo/fit/v4/EntityUpdateTestITCase.java | 4 +- .../olingo/fit/v4/ErrorResponseTestITCase.java | 8 +- .../olingo/fit/v4/FilterFactoryTestITCase.java | 4 +- .../fit/v4/JSONFormatConformanceTestITCase.java | 12 +- .../olingo/fit/v4/KeyAsSegmentTestITCase.java | 4 +- .../olingo/fit/v4/MediaEntityTestITCase.java | 4 +- .../olingo/fit/v4/MetadataTestITCase.java | 5 +- .../apache/olingo/fit/v4/OAuth2TestITCase.java | 2 +- .../olingo/fit/v4/OpenTypeTestITCase.java | 4 +- .../fit/v4/OperationImportInvokeTestITCase.java | 16 +- .../olingo/fit/v4/PropertyTestITCase.java | 6 +- .../olingo/fit/v4/PropertyValueTestITCase.java | 6 +- .../olingo/fit/v4/QueryOptionsTestITCase.java | 6 +- .../fit/v4/ServiceDocumentTestITCase.java | 2 +- .../olingo/fit/v4/SingletonTestITCase.java | 6 +- .../apache/olingo/client/api/ODataClient.java | 2 +- .../ODataClientErrorException.java | 10 +- .../request/cud/CUDRequestFactory.java | 8 +- .../request/cud/ODataEntityCreateRequest.java | 2 +- .../request/cud/ODataEntityUpdateRequest.java | 2 +- .../request/invoke/ClientNoContent.java | 2 +- .../invoke/EdmEnabledInvokeRequestFactory.java | 4 +- .../request/invoke/InvokeRequestFactory.java | 4 +- .../request/invoke/ODataInvokeRequest.java | 4 +- .../request/retrieve/ODataDeltaRequest.java | 2 +- .../request/retrieve/ODataEntityRequest.java | 2 +- .../retrieve/ODataEntitySetIteratorRequest.java | 4 +- .../request/retrieve/ODataEntitySetRequest.java | 2 +- .../request/retrieve/ODataPropertyRequest.java | 2 +- .../retrieve/ODataServiceDocumentRequest.java | 2 +- .../request/retrieve/ODataValueRequest.java | 2 +- .../retrieve/RetrieveRequestFactory.java | 8 +- .../MediaEntityCreateStreamManager.java | 2 +- .../MediaEntityUpdateStreamManager.java | 2 +- .../streamed/ODataMediaEntityCreateRequest.java | 2 +- .../streamed/ODataMediaEntityUpdateRequest.java | 2 +- .../response/ODataEntityCreateResponse.java | 2 +- .../response/ODataEntityUpdateResponse.java | 2 +- .../response/ODataInvokeResponse.java | 2 +- .../ODataMediaEntityCreateResponse.java | 2 +- .../ODataMediaEntityUpdateResponse.java | 2 +- .../response/ODataPropertyUpdateResponse.java | 2 +- .../response/ODataValueUpdateResponse.java | 2 +- .../olingo/client/api/data/ServiceDocument.java | 4 +- .../api/domain/AbstractClientPayload.java | 50 ++++ .../client/api/domain/AbstractClientValue.java | 120 ++++++++ .../client/api/domain/ClientAnnotatable.java | 26 ++ .../client/api/domain/ClientAnnotation.java | 30 ++ .../api/domain/ClientCollectionValue.java | 57 ++++ .../client/api/domain/ClientComplexValue.java | 58 ++++ .../client/api/domain/ClientDeletedEntity.java | 36 +++ .../olingo/client/api/domain/ClientDelta.java | 31 ++ .../client/api/domain/ClientDeltaLink.java | 36 +++ .../olingo/client/api/domain/ClientEntity.java | 202 +++++++++++++ .../client/api/domain/ClientEntitySet.java | 71 +++++ .../client/api/domain/ClientEnumValue.java | 27 ++ .../client/api/domain/ClientInlineEntity.java | 68 +++++ .../api/domain/ClientInlineEntitySet.java | 69 +++++ .../client/api/domain/ClientInvokeResult.java | 30 ++ .../olingo/client/api/domain/ClientItem.java | 96 ++++++ .../olingo/client/api/domain/ClientLink.java | 187 ++++++++++++ .../client/api/domain/ClientLinkType.java | 105 +++++++ .../olingo/client/api/domain/ClientLinked.java | 70 +++++ .../client/api/domain/ClientObjectFactory.java | 168 +++++++++++ .../client/api/domain/ClientOperation.java | 85 ++++++ .../client/api/domain/ClientPrimitiveValue.java | 88 ++++++ .../client/api/domain/ClientProperty.java | 32 ++ .../api/domain/ClientServiceDocument.java | 163 ++++++++++ .../client/api/domain/ClientSingleton.java | 23 ++ .../client/api/domain/ClientValuable.java | 94 ++++++ .../olingo/client/api/domain/ClientValue.java | 91 ++++++ .../api/domain/ODataEntitySetIterator.java | 2 - .../client/api/serialization/ODataBinder.java | 12 +- .../client/api/serialization/ODataReader.java | 12 +- .../client/api/serialization/ODataWriter.java | 6 +- .../olingo/client/core/ODataClientImpl.java | 4 +- .../header/ODataErrorResponseChecker.java | 8 +- .../request/cud/CUDRequestFactoryImpl.java | 8 +- .../cud/ODataEntityCreateRequestImpl.java | 2 +- .../cud/ODataEntityUpdateRequestImpl.java | 2 +- .../cud/ODataPropertyUpdateRequestImpl.java | 2 +- .../cud/ODataValueUpdateRequestImpl.java | 2 +- .../AbstractEdmEnabledInvokeRequestFactory.java | 4 +- .../invoke/AbstractInvokeRequestFactory.java | 10 +- .../invoke/AbstractODataInvokeRequest.java | 10 +- .../EdmEnabledInvokeRequestFactoryImpl.java | 4 +- .../invoke/InvokeRequestFactoryImpl.java | 4 +- .../request/invoke/ODataInvokeRequestImpl.java | 2 +- .../request/retrieve/ODataDeltaRequestImpl.java | 2 +- .../retrieve/ODataEntityRequestImpl.java | 2 +- .../ODataEntitySetIteratorRequestImpl.java | 4 +- .../retrieve/ODataEntitySetRequestImpl.java | 2 +- .../retrieve/ODataPropertyRequestImpl.java | 2 +- .../ODataServiceDocumentRequestImpl.java | 2 +- .../request/retrieve/ODataValueRequestImpl.java | 2 +- .../retrieve/RetrieveRequestFactoryImpl.java | 8 +- .../ODataMediaEntityCreateRequestImpl.java | 2 +- .../ODataMediaEntityUpdateRequestImpl.java | 2 +- .../core/domain/AbstractClientEntitySet.java | 71 +++++ .../core/domain/ClientAnnotationImpl.java | 102 +++++++ .../core/domain/ClientCollectionValueImpl.java | 124 ++++++++ .../core/domain/ClientComplexValueImpl.java | 204 +++++++++++++ .../core/domain/ClientDeletedEntityImpl.java | 54 ++++ .../client/core/domain/ClientDeltaImpl.java | 60 ++++ .../client/core/domain/ClientDeltaLinkImpl.java | 78 +++++ .../client/core/domain/ClientEntityImpl.java | 298 +++++++++++++++++++ .../client/core/domain/ClientEntitySetImpl.java | 65 ++++ .../client/core/domain/ClientEnumValueImpl.java | 59 ++++ .../core/domain/ClientObjectFactoryImpl.java | 155 ++++++++++ .../core/domain/ClientPrimitiveValueImpl.java | 222 ++++++++++++++ .../client/core/domain/ClientPropertyImpl.java | 163 ++++++++++ .../client/core/domain/ClientValuableImpl.java | 111 +++++++ .../ClientODataDeserializerImpl.java | 4 +- .../core/serialization/ODataBinderImpl.java | 54 ++-- .../core/serialization/ODataReaderImpl.java | 16 +- .../core/serialization/ODataWriterImpl.java | 6 +- .../apache/olingo/client/core/uri/URIUtils.java | 2 +- .../olingo/client/core/v4/EntitySetTest.java | 4 +- .../olingo/client/core/v4/EntityTest.java | 18 +- .../apache/olingo/client/core/v4/ErrorTest.java | 8 +- .../apache/olingo/client/core/v4/JSONTest.java | 8 +- .../olingo/client/core/v4/MetadataTest.java | 8 +- .../client/core/v4/PrimitiveValueTest.java | 2 +- .../olingo/client/core/v4/PropertyTest.java | 8 +- .../client/core/v4/ServiceDocumentTest.java | 2 +- .../apache/olingo/commons/api/Constants.java | 8 + .../apache/olingo/commons/api/data/Entity.java | 6 +- .../olingo/commons/api/data/Operation.java | 85 ++++++ .../api/domain/AbstractClientPayload.java | 50 ---- .../commons/api/domain/AbstractClientValue.java | 120 -------- .../commons/api/domain/ClientAnnotatable.java | 26 -- .../commons/api/domain/ClientAnnotation.java | 30 -- .../api/domain/ClientCollectionValue.java | 57 ---- .../commons/api/domain/ClientComplexValue.java | 58 ---- .../commons/api/domain/ClientDeletedEntity.java | 36 --- .../olingo/commons/api/domain/ClientDelta.java | 31 -- .../commons/api/domain/ClientDeltaLink.java | 36 --- .../olingo/commons/api/domain/ClientEntity.java | 202 ------------- .../commons/api/domain/ClientEntitySet.java | 71 ----- .../commons/api/domain/ClientEnumValue.java | 27 -- .../olingo/commons/api/domain/ClientError.java | 132 -------- .../commons/api/domain/ClientErrorDetail.java | 73 ----- .../commons/api/domain/ClientInlineEntity.java | 68 ----- .../api/domain/ClientInlineEntitySet.java | 69 ----- .../commons/api/domain/ClientInvokeResult.java | 30 -- .../olingo/commons/api/domain/ClientItem.java | 96 ------ .../olingo/commons/api/domain/ClientLink.java | 187 ------------ .../commons/api/domain/ClientLinkType.java | 105 ------- .../olingo/commons/api/domain/ClientLinked.java | 70 ----- .../commons/api/domain/ClientObjectFactory.java | 168 ----------- .../commons/api/domain/ClientOperation.java | 85 ------ .../api/domain/ClientPrimitiveValue.java | 88 ------ .../commons/api/domain/ClientProperty.java | 32 -- .../commons/api/domain/ClientPropertyType.java | 44 --- .../api/domain/ClientServiceDocument.java | 163 ---------- .../commons/api/domain/ClientSingleton.java | 23 -- .../commons/api/domain/ClientValuable.java | 94 ------ .../olingo/commons/api/domain/ClientValue.java | 91 ------ .../olingo/commons/api/domain/ODataError.java | 132 ++++++++ .../commons/api/domain/ODataErrorDetail.java | 73 +++++ .../commons/api/domain/ODataPropertyType.java | 44 +++ .../EdmConstantAnnotationExpression.java | 4 +- .../api/serialization/ODataDeserializer.java | 4 +- .../core/domain/AbstractClientEntitySet.java | 71 ----- .../core/domain/ClientAnnotationImpl.java | 102 ------- .../core/domain/ClientCollectionValueImpl.java | 124 -------- .../core/domain/ClientComplexValueImpl.java | 204 ------------- .../core/domain/ClientDeletedEntityImpl.java | 54 ---- .../commons/core/domain/ClientDeltaImpl.java | 60 ---- .../core/domain/ClientDeltaLinkImpl.java | 78 ----- .../commons/core/domain/ClientEntityImpl.java | 298 ------------------- .../core/domain/ClientEntitySetImpl.java | 65 ---- .../core/domain/ClientEnumValueImpl.java | 59 ---- .../core/domain/ClientObjectFactoryImpl.java | 155 ---------- .../core/domain/ClientPrimitiveValueImpl.java | 222 -------------- .../commons/core/domain/ClientPropertyImpl.java | 163 ---------- .../commons/core/domain/ClientValuableImpl.java | 111 ------- .../EdmConstantAnnotationExpressionImpl.java | 72 +++-- .../core/serialization/AtomDeserializer.java | 46 +-- .../core/serialization/AtomSerializer.java | 4 +- .../core/serialization/JsonDeserializer.java | 45 ++- .../serialization/JsonEntityDeserializer.java | 7 +- .../serialization/JsonEntitySerializer.java | 4 +- .../JsonODataErrorDeserializer.java | 10 +- .../JsonODataErrorDetailDeserializer.java | 8 +- .../core/serialization/JsonSerializer.java | 14 +- .../olingo/server/api/ClientServerError.java | 8 +- .../server/core/responses/ResponseUtil.java | 6 +- .../json/ODataJsonDeserializer.java | 9 +- .../serializer/json/ODataErrorSerializer.java | 8 +- .../json/ClientErrorSerializerTest.java | 12 +- .../olingo/server/tecsvc/data/DataCreator.java | 6 +- .../json/ODataDeserializerDeepInsertTest.java | 6 +- .../json/ODataJsonDeserializerEntityTest.java | 6 +- 239 files changed, 4822 insertions(+), 4711 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 276d6e4..dd10b75 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 @@ -35,7 +35,7 @@ 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.commons.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientAnnotation; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.AbstractTerm; import org.apache.olingo.ext.proxy.api.EntityType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 90309c5..891ba1c 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 @@ -30,10 +30,10 @@ 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.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientAnnotation; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientSingleton; +import org.apache.olingo.client.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientSingleton; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.AbstractSingleton; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java index a1005a3..258a496 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java @@ -32,8 +32,8 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.ComplexType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 d29aad4..6bb8673 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 @@ -40,9 +40,9 @@ import org.apache.olingo.client.api.communication.request.cud.ODataReferenceAddi 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.core.uri.URIUtils; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientLink; -import org.apache.olingo.commons.api.domain.ClientLinkType; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientLink; +import org.apache.olingo.client.api.domain.ClientLinkType; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.EdmStreamValue; import org.apache.olingo.ext.proxy.api.PersistenceManager; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 0795e8b..96b3f26 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 @@ -41,13 +41,13 @@ import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.uri.QueryOption; import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientInlineEntity; -import org.apache.olingo.commons.api.domain.ClientInlineEntitySet; -import org.apache.olingo.commons.api.domain.ClientLink; -import org.apache.olingo.commons.api.domain.ClientLinked; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientInlineEntity; +import org.apache.olingo.client.api.domain.ClientInlineEntitySet; +import org.apache.olingo.client.api.domain.ClientLink; +import org.apache.olingo.client.api.domain.ClientLinked; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.ext.proxy.AbstractService; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java index 4b66898..a0b18ba 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java @@ -27,9 +27,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.commons.api.domain.ClientAnnotation; -import org.apache.olingo.commons.api.domain.ClientComplexValue; -import org.apache.olingo.commons.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientComplexValue; +import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.AbstractTerm; import org.apache.olingo.ext.proxy.api.Annotatable; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java index 1607cfe..ff4fc66 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java @@ -33,10 +33,10 @@ import org.apache.commons.lang3.tuple.Triple; import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientAnnotation; -import org.apache.olingo.commons.api.domain.ClientCollectionValue; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientCollectionValue; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.ComplexCollection; import org.apache.olingo.ext.proxy.api.ComplexType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java index 16467c2..3aa3326 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java @@ -28,9 +28,9 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientComplexValue; -import org.apache.olingo.commons.api.domain.ClientLinked; -import org.apache.olingo.commons.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientComplexValue; +import org.apache.olingo.client.api.domain.ClientLinked; +import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.annotations.ComplexType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java index b903fdb..b31e624 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java @@ -25,7 +25,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.net.URI; import org.apache.commons.lang3.ArrayUtils; -import org.apache.olingo.commons.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.ComplexCollection; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java index fff16b4..66bc66c 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java @@ -34,9 +34,9 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientAnnotation; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.ext.proxy.AbstractService; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 950b0ff..6c8d35f 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 @@ -30,8 +30,8 @@ import java.util.concurrent.Future; import org.apache.commons.lang3.tuple.Triple; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientAnnotation; -import org.apache.olingo.commons.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.ext.proxy.AbstractService; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java index 9bbeeb0..87bc08d 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.NoSuchElementException; import org.apache.commons.lang3.tuple.Triple; -import org.apache.olingo.commons.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientAnnotation; 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/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java index 733391c..53208f7 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java @@ -34,11 +34,11 @@ import org.apache.olingo.client.api.communication.request.invoke.ClientNoContent import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientInvokeResult; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientInvokeResult; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmOperation; import org.apache.olingo.commons.api.edm.EdmReturnType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java index d92d39e..bdab06c 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java @@ -30,9 +30,9 @@ import java.util.List; import java.util.Map; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientOperation; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientOperation; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntityType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java index e40593d..553af6e 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java @@ -34,9 +34,9 @@ import org.apache.commons.lang3.tuple.Triple; import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientAnnotation; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientValue; 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/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java index 2ca7b86..41ec9ce 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.Map; import org.apache.commons.lang3.ArrayUtils; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmOperation; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.ext.proxy.AbstractService; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java index 1506655..91a7dec 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java @@ -22,7 +22,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.olingo.commons.api.domain.ClientLinkType; +import org.apache.olingo.client.api.domain.ClientLinkType; import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java index 882f0f6..2776f3b 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java @@ -40,22 +40,22 @@ import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.commons.api.domain.ClientAnnotatable; -import org.apache.olingo.commons.api.domain.ClientAnnotation; -import org.apache.olingo.commons.api.domain.ClientComplexValue; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEnumValue; -import org.apache.olingo.commons.api.domain.ClientLink; -import org.apache.olingo.commons.api.domain.ClientPrimitiveValue; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientAnnotatable; +import org.apache.olingo.client.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientComplexValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEnumValue; +import org.apache.olingo.client.api.domain.ClientLink; +import org.apache.olingo.client.api.domain.ClientPrimitiveValue; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.core.domain.ClientAnnotationImpl; +import org.apache.olingo.client.core.domain.ClientAnnotationImpl; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.ext.proxy.AbstractService; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java index cb17b14..1800b1f 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java @@ -22,9 +22,9 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.commons.ComplexInvocationHandler; import org.apache.olingo.ext.proxy.commons.EntityCollectionInvocationHandler; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java index da0e742..823592d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java @@ -32,9 +32,9 @@ import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataSerializerException; import org.apache.olingo.fit.server.TomcatTestServer; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java index 9f6c183..1037a9c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java @@ -34,12 +34,12 @@ import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.response.ODataInvokeResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientCollectionValue; -import org.apache.olingo.commons.api.domain.ClientComplexValue; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientCollectionValue; +import org.apache.olingo.client.api.domain.ClientComplexValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.fit.AbstractBaseTestITCase; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 8a19000..5463ffa 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 @@ -53,17 +53,17 @@ 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.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientAnnotation; -import org.apache.olingo.commons.api.domain.ClientComplexValue; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientError; -import org.apache.olingo.commons.api.domain.ClientInlineEntity; -import org.apache.olingo.commons.api.domain.ClientInlineEntitySet; -import org.apache.olingo.commons.api.domain.ClientObjectFactory; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientServiceDocument; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientAnnotation; +import org.apache.olingo.client.api.domain.ClientComplexValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.commons.api.domain.ODataError; +import org.apache.olingo.client.api.domain.ClientInlineEntity; +import org.apache.olingo.client.api.domain.ClientInlineEntitySet; +import org.apache.olingo.client.api.domain.ClientObjectFactory; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientServiceDocument; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -174,7 +174,7 @@ public class BasicITCase extends AbstractBaseTestITCase { fail("Expected Exception not thrown!"); } catch (final ODataClientErrorException e) { assertEquals(HttpStatusCode.BAD_REQUEST.getStatusCode(), e.getStatusLine().getStatusCode()); - final ClientError error = e.getODataError(); + final ODataError error = e.getODataError(); assertThat(error.getMessage(), containsString("key property")); } } @@ -464,22 +464,26 @@ public class BasicITCase extends AbstractBaseTestITCase { .add( of.newComplexValue("CTPrimComp") .add( - of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16( - (short) 42))) + of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() + .buildInt16( + (short) 42))) .add( of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") .add( - of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder() + of.newPrimitiveProperty("PropertyString", of + .newPrimitiveValueBuilder() .buildString("42")))))) .add( of.newComplexValue("CTPrimComp") .add( - of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16( - (short) 43))) + of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() + .buildInt16( + (short) 43))) .add( of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") .add( - of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder() + of.newPrimitiveProperty("PropertyString", of + .newPrimitiveValueBuilder() .buildString("43")))))))); final URI uri = getClient().newURIBuilder(SERVICE_URI) @@ -489,8 +493,8 @@ public class BasicITCase extends AbstractBaseTestITCase { final ODataEntityUpdateResponse<ClientEntity> response = getClient().getCUDRequestFactory() .getEntityUpdateRequest(uri, - UpdateType.PATCH, - entity) + UpdateType.PATCH, + entity) .execute(); assertEquals(HttpStatusCode.NO_CONTENT.getStatusCode(), response.getStatusCode()); @@ -536,38 +540,27 @@ public class BasicITCase extends AbstractBaseTestITCase { final ClientEntity entity = of.newEntity(new FullQualifiedName("olingo.odata.test1", "ETKeyNav")); entity.getProperties().add( of.newPrimitiveProperty("PropertyString", - of.newPrimitiveValueBuilder().buildString("Complex collection test"))); + of.newPrimitiveValueBuilder().buildString("Complex collection test"))); entity.getProperties().add(of.newComplexProperty("PropertyCompTwoPrim", - of.newComplexValue("CTTwoPrim") - .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16((short) 1))) - .add(of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder().buildString("1"))))); - - entity.getProperties().add( - of.newCollectionProperty("CollPropertyComp", - of.newCollectionValue("CTPrimComp") - .add( - of.newComplexValue("CTPrimComp") - .add( - of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() - .buildInt16((short) 1))) - .add( - of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") - .add( - of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder() - .buildString("1")))))) - .add( - of.newComplexValue("CTPrimComp") - .add( - of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") - .add( - of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder() - .buildString("2"))) - .add( - of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16( - (short) 2))) - .add( - of.newPrimitiveProperty("PropertySingle", of.newPrimitiveValueBuilder() - .buildSingle(2.0f)))))))); + of.newComplexValue("CTTwoPrim") + .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16((short) 1))) + .add(of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder().buildString("1"))))); + + entity.getProperties().add(of.newCollectionProperty("CollPropertyComp", + of.newCollectionValue("CTPrimComp") + .add(of.newComplexValue("CTPrimComp") + .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16((short) 1))) + .add(of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") + .add(of.newPrimitiveProperty("PropertyString", + of.newPrimitiveValueBuilder().buildString("1")))))) + .add(of.newComplexValue("CTPrimComp") + .add(of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") + .add(of.newPrimitiveProperty("PropertyString", of.newPrimitiveValueBuilder().buildString + ("2"))) + .add(of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder().buildInt16( + (short) 2))) + .add(of.newPrimitiveProperty("PropertySingle", + of.newPrimitiveValueBuilder().buildSingle(2.0f)))))))); entity.addLink(of.newEntityNavigationLink("NavPropertyETTwoKeyNavOne", getClient().newURIBuilder(SERVICE_URI) @@ -678,9 +671,9 @@ public class BasicITCase extends AbstractBaseTestITCase { final ODataEntityRequest<ClientEntity> entityRequest = client.getRetrieveRequestFactory() .getEntityRequest(client.newURIBuilder() - .appendEntitySetSegment("ESTwoPrim") - .appendKeySegment(key) - .build()); + .appendEntitySetSegment("ESTwoPrim") + .appendKeySegment(key) + .build()); entityRequest.addCustomHeader(HttpHeader.COOKIE, cookie); final ODataRetrieveResponse<ClientEntity> responseEntityRequest = entityRequest.execute(); assertEquals(HttpStatusCode.OK.getStatusCode(), responseEntityRequest.getStatusCode()); @@ -754,7 +747,7 @@ public class BasicITCase extends AbstractBaseTestITCase { entity.getProperties().add(of.newComplexProperty("PropertyCompAllPrim", of.newComplexValue("CTAllPrim") .add(of.newPrimitiveProperty("PropertyString", - of.newPrimitiveValueBuilder().buildString("Changed"))))); + of.newPrimitiveValueBuilder().buildString("Changed"))))); final ODataEntityUpdateResponse<ClientEntity> response = client.getCUDRequestFactory() .getEntityUpdateRequest(targetURI, UpdateType.PATCH, entity) @@ -765,11 +758,11 @@ public class BasicITCase extends AbstractBaseTestITCase { final ODataEntityRequest<ClientEntity> entityRequest = client.getRetrieveRequestFactory() .getEntityRequest( - client.newURIBuilder() - .appendEntitySetSegment("ESKeyNav") - .appendKeySegment(1) - .expand("NavPropertyETKeyNavOne", "NavPropertyETKeyNavMany") - .build()); + client.newURIBuilder() + .appendEntitySetSegment("ESKeyNav") + .appendKeySegment(1) + .expand("NavPropertyETKeyNavOne", "NavPropertyETKeyNavMany") + .build()); entityRequest.addCustomHeader(HttpHeader.COOKIE, cookie); final ODataRetrieveResponse<ClientEntity> entitytResponse = entityRequest.execute(); @@ -854,7 +847,7 @@ public class BasicITCase extends AbstractBaseTestITCase { entity.getProperties().add(of.newComplexProperty("PropertyCompAllPrim", of.newComplexValue("CTAllPrim") .add(of.newPrimitiveProperty("PropertyString", - of.newPrimitiveValueBuilder().buildString("Changed"))))); + of.newPrimitiveValueBuilder().buildString("Changed"))))); final ODataEntityUpdateResponse<ClientEntity> response = client.getCUDRequestFactory() .getEntityUpdateRequest(targetURI, UpdateType.REPLACE, entity) @@ -865,11 +858,11 @@ public class BasicITCase extends AbstractBaseTestITCase { final ODataEntityRequest<ClientEntity> entityRequest = client.getRetrieveRequestFactory() .getEntityRequest( - client.newURIBuilder() - .appendEntitySetSegment("ESKeyNav") - .appendKeySegment(1) - .expand("NavPropertyETKeyNavOne", "NavPropertyETKeyNavMany") - .build()); + client.newURIBuilder() + .appendEntitySetSegment("ESKeyNav") + .appendKeySegment(1) + .expand("NavPropertyETKeyNavOne", "NavPropertyETKeyNavMany") + .build()); entityRequest.addCustomHeader(HttpHeader.COOKIE, cookie); final ODataRetrieveResponse<ClientEntity> entitytResponse = entityRequest.execute(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 c03490c..08bb95a 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 @@ -45,9 +45,9 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.communication.request.batch.ODataChangesetResponseItem; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientObjectFactory; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientObjectFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ContentType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java index 57a3ed2..daad079 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java @@ -35,12 +35,12 @@ import org.apache.olingo.client.api.communication.response.ODataEntityCreateResp import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientInlineEntity; -import org.apache.olingo.commons.api.domain.ClientLink; -import org.apache.olingo.commons.api.domain.ClientObjectFactory; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientInlineEntity; +import org.apache.olingo.client.api.domain.ClientLink; +import org.apache.olingo.client.api.domain.ClientObjectFactory; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; @@ -107,6 +107,7 @@ public class BindingITCase extends AbstractBaseTestITCase { .appendEntitySetSegment(ES_TWO_KEY_NAV) .appendKeySegment(new LinkedHashMap<String, Object>() { private static final long serialVersionUID = 3109256773218160485L; + { put(PROPERTY_INT16, 3); put(PROPERTY_STRING, "1"); @@ -348,6 +349,7 @@ public class BindingITCase extends AbstractBaseTestITCase { .appendEntitySetSegment(ES_TWO_KEY_NAV) .appendKeySegment(new LinkedHashMap<String, Object>() { private static final long serialVersionUID = 3109256773218160485L; + { put(PROPERTY_INT16, 3); put(PROPERTY_STRING, "1"); @@ -362,6 +364,7 @@ public class BindingITCase extends AbstractBaseTestITCase { .appendEntitySetSegment(ES_TWO_KEY_NAV) .appendKeySegment(new LinkedHashMap<String, Object>() { private static final long serialVersionUID = 3109256773218160485L; + { put(PROPERTY_INT16, 3); put(PROPERTY_STRING, "1"); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java index 5e25b79..4bec968 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java @@ -40,15 +40,15 @@ import org.apache.olingo.client.api.communication.response.ODataEntityCreateResp import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientComplexValue; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientInlineEntity; -import org.apache.olingo.commons.api.domain.ClientInlineEntitySet; -import org.apache.olingo.commons.api.domain.ClientLink; -import org.apache.olingo.commons.api.domain.ClientObjectFactory; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientComplexValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientInlineEntity; +import org.apache.olingo.client.api.domain.ClientInlineEntitySet; +import org.apache.olingo.client.api.domain.ClientLink; +import org.apache.olingo.client.api.domain.ClientObjectFactory; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java index 9a430ff..a4fc570 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java @@ -28,12 +28,12 @@ import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientInlineEntity; -import org.apache.olingo.commons.api.domain.ClientInlineEntitySet; -import org.apache.olingo.commons.api.domain.ClientLink; -import org.apache.olingo.commons.api.domain.ClientLinkType; -import org.apache.olingo.commons.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientInlineEntity; +import org.apache.olingo.client.api.domain.ClientInlineEntitySet; +import org.apache.olingo.client.api.domain.ClientLink; +import org.apache.olingo.client.api.domain.ClientLinkType; +import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.AbstractBaseTestITCase; import org.apache.olingo.fit.tecsvc.TecSvcConst; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java index 38aec61..1f13f88 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java @@ -33,8 +33,8 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.uri.QueryOption; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpStatusCode; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java index 383b709..02a287c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java @@ -30,10 +30,10 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientObjectFactory; -import org.apache.olingo.commons.api.domain.ClientValuable; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientObjectFactory; +import org.apache.olingo.client.api.domain.ClientValuable; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpHeader; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java index 9078d8f..ae7dabf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java @@ -34,11 +34,11 @@ import org.apache.olingo.client.api.communication.response.ODataInvokeResponse; import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientPrimitiveValue; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientPrimitiveValue; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.AbstractBaseTestITCase; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 5df211c..582cf43 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 @@ -39,8 +39,8 @@ import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreat import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpHeader; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 46261b2..b3db254 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 @@ -24,9 +24,9 @@ import static org.junit.Assert.assertNotNull; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.AbstractBaseTestITCase; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java index 629f856..26be32e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java @@ -27,9 +27,9 @@ import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientValuable; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientValuable; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.AbstractBaseTestITCase; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 892cdd5..814fad4 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 @@ -36,8 +36,8 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataValueReq import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientPrimitiveValue; -import org.apache.olingo.commons.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientPrimitiveValue; +import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpHeader; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java index 995925b..4362f44 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.uri.QueryOption; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.AbstractBaseTestITCase; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 8a4bcdc..c740607 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 @@ -26,15 +26,15 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.commons.api.domain.ClientCollectionValue; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientCollectionValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.core.domain.ClientEntityImpl; +import org.apache.olingo.client.core.domain.ClientEntityImpl; import org.apache.olingo.fit.AbstractBaseTestITCase; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 3e9a85f..ad89514 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 @@ -24,11 +24,11 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe import org.apache.olingo.client.api.communication.response.AsyncResponseWrapper; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientInlineEntity; -import org.apache.olingo.commons.api.domain.ClientLink; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientInlineEntity; +import org.apache.olingo.client.api.domain.ClientLink; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 a76e97a..f5175e0 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 @@ -31,7 +31,7 @@ import org.apache.olingo.client.api.http.HttpClientException; 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.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ContentType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 880dd95..33509da 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 @@ -46,8 +46,8 @@ import org.apache.olingo.client.core.communication.request.batch.ODataSingleResp import org.apache.olingo.client.core.communication.request.retrieve.ODataEntityRequestImpl; import org.apache.olingo.client.core.communication.request.retrieve.ODataEntityRequestImpl.ODataEntityResponseImpl; import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 b48902f..1437e8c 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 @@ -21,16 +21,16 @@ 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.URIBuilder; -import org.apache.olingo.commons.api.domain.ClientCollectionValue; -import org.apache.olingo.commons.api.domain.ClientComplexValue; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientEnumValue; -import org.apache.olingo.commons.api.domain.ClientOperation; -import org.apache.olingo.commons.api.domain.ClientPrimitiveValue; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientSingleton; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientCollectionValue; +import org.apache.olingo.client.api.domain.ClientComplexValue; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientEnumValue; +import org.apache.olingo.client.api.domain.ClientOperation; +import org.apache.olingo.client.api.domain.ClientPrimitiveValue; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientSingleton; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/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 06e3552..3ca87ce 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 @@ -46,16 +46,16 @@ 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; -import org.apache.olingo.commons.api.domain.ClientCollectionValue; -import org.apache.olingo.commons.api.domain.ClientDelta; -import org.apache.olingo.commons.api.domain.ClientEntity; -import org.apache.olingo.commons.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ClientProperty; -import org.apache.olingo.commons.api.domain.ClientValue; +import org.apache.olingo.client.api.domain.ClientCollectionValue; +import org.apache.olingo.client.api.domain.ClientDelta; +import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.core.domain.ClientEntityImpl; +import org.apache.olingo.client.core.domain.ClientEntityImpl; import org.junit.Test; /**
