diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml index eb3f9e3b9..017ec129a 100644 --- a/lib/client-api/pom.xml +++ b/lib/client-api/pom.xml @@ -49,11 +49,6 @@ org.apache.httpcomponents httpclient - - - org.slf4j - slf4j-api - diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java index 48f2614de..59786f3a7 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataMediaFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.HttpUriRequestFactory; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java index 6c4436081..4b708d9eb 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java @@ -24,9 +24,9 @@ import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFa import org.apache.olingo.client.api.communication.request.invoke.CommonInvokeRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory; import org.apache.olingo.client.api.communication.request.streamed.CommonStreamedRequestFactory; -import org.apache.olingo.client.api.domain.ODataObjectFactory; -import org.apache.olingo.client.api.domain.ODataGeospatialValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataObjectFactory; +import org.apache.olingo.commons.api.domain.ODataGeospatialValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.client.api.op.CommonODataBinder; import org.apache.olingo.client.api.op.CommonODataDeserializer; import org.apache.olingo.client.api.op.CommonODataReader; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java index 6f94915e2..b4c3d6b77 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java @@ -24,7 +24,7 @@ import javax.xml.namespace.QName; /** * Constant values related to the OData protocol. */ -public class Constants { +public interface Constants { // Other stuff public final static String UTF8 = "UTF-8"; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java index c0f5b2ec1..6f6f502dd 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java @@ -21,10 +21,10 @@ package org.apache.olingo.client.api.communication.request.cud; import java.io.Serializable; import java.net.URI; import org.apache.olingo.client.api.communication.request.UpdateType; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; /** * OData request factory class. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java index 7206f50b5..79b2641fe 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData delete request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java index 357ed9a79..02f41e7c9 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData create request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java index bff13dcbf..11bc797cc 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData update request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkCreateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkCreateRequest.java index 65c070d86..adf6f0d49 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkCreateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkCreateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an insert link OData request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkUpdateRequest.java index 624c6932a..00f9216e8 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkUpdateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkUpdateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an update link OData request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java index 683c3e393..53fa4473e 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateResponse; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData update entity property request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java index 708578843..753fde87f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; /** * This class implements an OData update entity property value request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/CommonInvokeRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/CommonInvokeRequestFactory.java index e7104bc04..0198b9298 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/CommonInvokeRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/CommonInvokeRequestFactory.java @@ -21,8 +21,8 @@ package org.apache.olingo.client.api.communication.request.invoke; import java.io.Serializable; import java.net.URI; import java.util.LinkedHashMap; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java index 22360fb71..986a13bf7 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java @@ -21,9 +21,9 @@ package org.apache.olingo.client.api.communication.request.invoke; import java.util.Map; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataInvokeResponse; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData invoke operation request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java index e9c0379ca..4f3251602 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.api.communication.request.invoke; import java.io.Serializable; -import org.apache.olingo.client.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; /** * Marker class for invoke with no return type. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java index 9dd7104b8..a22f82c02 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData retrieve query request returning a single entity. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java index 2d7c369cb..dd2cf46da 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.api.communication.request.retrieve; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData EntitySet query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java index d76d04a48..fbafafd42 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData EntitySet query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java index 4500152ea..a4bbf3cd2 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.api.communication.request.retrieve; import java.io.InputStream; -import org.apache.olingo.client.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; /** * This class implements an OData media query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMetadataRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMetadataRequest.java index c87e449d3..3dcc81b6b 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMetadataRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMetadataRequest.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.Edm; /** diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java index 9806a2e85..7492e11ab 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData entity property query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java index 862ed490b..580798ca6 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData service document request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java index e731dfe68..e78067a11 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; /** * This class implements an OData entity property value query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java index 7cfba7b75..1494aeaeb 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.retrieve.v3; import org.apache.olingo.client.api.communication.request.retrieve.ODataRetrieveRequest; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData link query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java index 3753016ea..7d898f50c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.api.communication.request.streamed; import org.apache.olingo.client.api.communication.request.ODataStreamManager; import org.apache.olingo.client.api.communication.request.ODataStreamedRequest; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * Abstract class representing a request concerning a streamed entity. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java index c4eaf22f0..5fd7fb81b 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; /** * This class implements the response to an OData entity create request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java index fec48d611..6b84630c6 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; /** * This class implements the response to an OData update request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataInvokeResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataInvokeResponse.java index 8a5cdaa19..ab1d89078 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataInvokeResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataInvokeResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; /** * This class implements a response to a specific invoke request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java index 98bd90efc..ea3b8b7ce 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; /** * This class implements the response to an Odata media entity create request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java index e24b61575..f55dac81c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; /** * This class implements the response to an Odata media entity update request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataPropertyUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataPropertyUpdateResponse.java index c398aa207..23bfc1e09 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataPropertyUpdateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataPropertyUpdateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataProperty; /** * This class implements the response to an OData update entity property request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataValueUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataValueUpdateResponse.java index 9d8855b2b..8a0ab1b1d 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataValueUpdateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataValueUpdateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; /** * This class implements the response to an OData update entity property request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java index 78a7b93fc..0fcf77c99 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.data; -import org.apache.olingo.client.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataOperation; import java.net.URI; import java.util.List; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java index 26ef195d3..8c1db4d49 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java @@ -31,7 +31,9 @@ import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java index 94375f66a..8dd723226 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java @@ -25,11 +25,11 @@ import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; public interface CommonODataBinder extends Serializable { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java index d0edb3b9b..0c0428ca5 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java @@ -26,8 +26,8 @@ import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.XMLMetadata; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * Utility class for serialization. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java index ceb7f6bdd..3f28f623c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java @@ -21,12 +21,12 @@ package org.apache.olingo.client.api.op; import java.io.InputStream; import java.io.Serializable; import org.apache.olingo.client.api.data.ODataError; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.Edm; /** diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java index e7f968254..0734586d3 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java @@ -25,7 +25,7 @@ import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * Utility class for serialization. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataWriter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataWriter.java index dd7afcd59..b83b2cd72 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataWriter.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataWriter.java @@ -21,11 +21,11 @@ package org.apache.olingo.client.api.op; import java.io.InputStream; import java.io.Serializable; import java.util.Collection; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * OData writer. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java index 1b4a98b49..99d840da8 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.op.v3; import java.io.InputStream; import org.apache.olingo.client.api.data.v3.LinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.CommonODataDeserializer; public interface ODataDeserializer extends CommonODataDeserializer { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataReader.java index bb436ad58..7049617e0 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataReader.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.op.v3; import java.io.InputStream; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.CommonODataReader; public interface ODataReader extends CommonODataReader { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java index 5c32aecab..f50ced36c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java @@ -24,10 +24,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import org.apache.olingo.client.api.CommonConfiguration; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataMediaFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.HttpUriRequestFactory; import org.apache.olingo.client.core.http.DefaultHttpClientFactory; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java index b5cfdeabc..6c889e818 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.core; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.domain.ODataObjectFactory; +import org.apache.olingo.commons.api.domain.ODataObjectFactory; import org.apache.olingo.client.api.op.ODataWriter; import org.apache.olingo.client.core.domain.ODataGeospatialValueImpl; import org.apache.olingo.client.core.domain.ODataPrimitiveValueImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java index d088e97ef..44f7c4540 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java @@ -43,9 +43,9 @@ import org.apache.olingo.client.api.communication.header.ODataHeaders; import org.apache.olingo.client.api.communication.request.ODataRequest; import org.apache.olingo.client.api.communication.request.ODataStreamer; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.format.ODataMediaFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.data.JSONErrorImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java index 4659d15e1..cb82cbd99 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java @@ -29,10 +29,10 @@ import org.apache.olingo.client.api.communication.request.cud.ODataLinkCreateReq import org.apache.olingo.client.api.communication.request.cud.ODataLinkUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.client.api.http.HttpMethod; public abstract class AbstractCUDRequestFactory implements CommonCUDRequestFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java index 720c5b679..fccfa3d13 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java @@ -26,7 +26,7 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java index 6cf1927bd..c22b5de81 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java index 012d975e8..565c59e37 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkCreateRequestImpl.java index 0f9186448..e64579dff 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkCreateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataLinkCreateRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkUpdateRequestImpl.java index 0fea3a912..2644189f5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkUpdateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataLinkUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java index 04c87ccb7..b3be3eb2f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateResponse; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java index dc3a7272d..d424d6281 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java index a9c6dfcb9..eb0d45b8c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java @@ -22,7 +22,7 @@ import java.net.URI; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.invoke.CommonInvokeRequestFactory; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; -import org.apache.olingo.client.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java index c6355e4b3..f15879e72 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java @@ -35,13 +35,13 @@ import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent; import org.apache.olingo.client.api.communication.response.ODataInvokeResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java index 0ccb3c72d..2487dd9fa 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java @@ -25,11 +25,11 @@ import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent; import org.apache.olingo.client.api.communication.request.invoke.v3.InvokeRequestFactory; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.invoke.AbstractInvokeRequestFactory; import org.apache.olingo.client.core.communication.request.invoke.ODataInvokeRequestImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java index 0e7f4b14b..d6f929da2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java @@ -24,8 +24,8 @@ import org.apache.commons.lang3.NotImplementedException; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.invoke.v4.InvokeRequestFactory; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.core.communication.request.invoke.AbstractInvokeRequestFactory; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java index 2390ac3f8..447f54346 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java @@ -24,8 +24,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData retrieve query request returning a single entity. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java index 261611c42..bfdddef8f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java @@ -25,7 +25,7 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData EntitySet query request. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java index 1decb5405..ef191bad2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java @@ -24,8 +24,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; 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.domain.ODataEntitySet; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData EntitySet query request. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java index b2a0f5d2a..4460be309 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java @@ -27,7 +27,7 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.header.HeaderName; 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.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; import org.apache.olingo.client.api.http.HttpClientException; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMetadataRequestImpl.java index 58c7cb75d..d5ee545cf 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMetadataRequestImpl.java @@ -26,7 +26,7 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataMetadataRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.Edm; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java index 5055a750d..a768906f1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java @@ -25,8 +25,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; 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.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpClientException; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java index 4226cc208..d6a2a9933 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java @@ -27,7 +27,7 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; 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.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.ODataRequestImpl; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java index 1fb98da9b..128e2504f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java @@ -24,8 +24,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData service document request. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java index fd4e64727..345bc5892 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java @@ -25,8 +25,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.core.domain.ODataPrimitiveValueImpl; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/ODataLinkCollectionRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/ODataLinkCollectionRequestImpl.java index 0cdd38ac6..70044b10c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/ODataLinkCollectionRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/ODataLinkCollectionRequestImpl.java @@ -26,7 +26,7 @@ import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.v3.ODataLinkCollectionRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.core.communication.request.retrieve.AbstractODataRetrieveRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedEntityRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedEntityRequest.java index d19d0d5ef..84a22536e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedEntityRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedEntityRequest.java @@ -23,7 +23,7 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataStreamManager; import org.apache.olingo.client.api.communication.request.streamed.ODataStreamedEntityRequest; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java index 5563a74bb..efd0cf20a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java @@ -34,7 +34,7 @@ import org.apache.olingo.client.api.communication.request.ODataStreamedRequest; import org.apache.olingo.client.api.communication.request.ODataStreamer; import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.Wrapper; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java index b69a35a0f..f8487bc75 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java @@ -28,7 +28,7 @@ import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.streamed.MediaEntityCreateStreamManager; import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest; import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.AbstractODataStreamManager; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java index f6dc09b00..4f0edce86 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java @@ -28,7 +28,7 @@ import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.streamed.MediaEntityUpdateStreamManager; import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.AbstractODataStreamManager; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java index f92c44b4a..8b513bffd 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java @@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataOperation; /** * Abstract base for classes implementing an OData entry in Atom and JSON. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java index 74b29fbce..4b0ee0ed0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java @@ -27,7 +27,7 @@ import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.CollectionValue; import org.apache.olingo.client.api.data.ComplexValue; import org.apache.olingo.client.api.data.Value; -import org.apache.olingo.client.api.domain.ODataPropertyType; +import org.apache.olingo.commons.api.domain.ODataPropertyType; import org.apache.olingo.client.core.edm.EdmTypeInfo; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java index 8893b9171..74d98a6cc 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java @@ -31,7 +31,7 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; import org.apache.http.entity.ContentType; import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java index 884d81583..736d791c0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java @@ -28,7 +28,7 @@ import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.CollectionValue; import org.apache.olingo.client.api.data.ComplexValue; import org.apache.olingo.client.api.data.Value; -import org.apache.olingo.client.api.domain.ODataPropertyType; +import org.apache.olingo.commons.api.domain.ODataPropertyType; import org.apache.olingo.client.core.edm.EdmTypeInfo; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java index 378d676e8..2626a95b3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java @@ -36,8 +36,8 @@ import java.util.Map; import java.util.Set; import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.Link; -import org.apache.olingo.client.api.domain.ODataLinkType; -import org.apache.olingo.client.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataLinkType; +import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java index 2e48f7303..348015e54 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java @@ -31,7 +31,7 @@ import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.domain.ODataLinkType; +import org.apache.olingo.commons.api.domain.ODataLinkType; /** * Writes out JSON string from an entry. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataGeospatialValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataGeospatialValueImpl.java index 43ef05600..daa63a3a8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataGeospatialValueImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataGeospatialValueImpl.java @@ -20,8 +20,8 @@ package org.apache.olingo.client.core.domain; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.olingo.client.api.domain.AbstractODataValue; -import org.apache.olingo.client.api.domain.ODataGeospatialValue; +import org.apache.olingo.commons.api.domain.AbstractODataValue; +import org.apache.olingo.commons.api.domain.ODataGeospatialValue; import org.apache.olingo.commons.api.edm.EdmGeospatialType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.Geospatial; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java index e6a040868..aac8ee389 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java @@ -23,8 +23,8 @@ import java.util.Calendar; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.domain.AbstractODataValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.AbstractODataValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java index a7f9a442b..4e53ce3e9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java @@ -31,18 +31,18 @@ import org.apache.olingo.client.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.data.ServiceDocumentItem; import org.apache.olingo.client.api.data.Value; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataOperation; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.op.CommonODataBinder; import org.apache.olingo.client.core.data.CollectionValueImpl; import org.apache.olingo.client.core.data.ComplexValueImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java index 483dc7bf8..2b4385ec2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java @@ -24,8 +24,8 @@ import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.ODataError; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.op.CommonODataDeserializer; import org.apache.olingo.client.core.data.AtomDeserializer; import org.apache.olingo.client.core.data.AtomEntryImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java index 031eb5020..b0869cf32 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java @@ -23,16 +23,16 @@ import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.data.ODataError; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.api.edm.xml.XMLMetadata; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.op.CommonODataReader; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.slf4j.Logger; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java index 48a0b8d41..7a1a01534 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java @@ -30,7 +30,7 @@ import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.ODataSerializer; import org.apache.olingo.client.core.data.AtomEntryImpl; import org.apache.olingo.client.core.data.AtomFeedImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java index 0b71abc41..a7bf76d58 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java @@ -20,18 +20,18 @@ package org.apache.olingo.client.core.op; import java.net.URI; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.domain.ODataLinkType; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataGeospatialValue; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataObjectFactory; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataLinkType; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataGeospatialValue; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataObjectFactory; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; public class ODataObjectFactoryImpl implements ODataObjectFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java index 7e5c9b4a6..80f4f11e2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java @@ -25,11 +25,11 @@ import java.util.Collection; import java.util.Collections; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.op.ODataWriter; public class ODataWriterImpl implements ODataWriter { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java index da3ead280..8b44e2b6b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.core.op; import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.data.AtomEntryImpl; import org.apache.olingo.client.core.data.AtomFeedImpl; import org.apache.olingo.client.core.data.AtomPropertyImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java index edb98a0d4..0baf40345 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java @@ -22,7 +22,7 @@ import java.io.InputStream; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.data.v3.LinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v3.ODataDeserializer; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.data.v3.JSONLinkCollectionImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java index 2e8a08071..2c5a7d17e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java @@ -20,9 +20,9 @@ package org.apache.olingo.client.core.op.impl.v3; import java.io.InputStream; -import org.apache.olingo.client.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v3.ODataReader; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.v3.ODataClientImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java index 80863cb1e..9c81baf90 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.core.op.impl.v4; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.data.ServiceDocumentItem; -import org.apache.olingo.client.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.client.api.op.v4.ODataBinder; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.api.v4.ODataClient; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java index 95fde7764..3b825e251 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java @@ -22,7 +22,7 @@ import java.io.InputStream; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.v4.XMLMetadata; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v4.ODataDeserializer; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java index 4260ba80a..1a93ce144 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java @@ -20,8 +20,8 @@ package org.apache.olingo.client.core.op.impl.v4; import java.io.InputStream; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v4.ODataReader; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.edm.EdmClientImpl; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java index df66603d2..fe3f0981f 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java @@ -29,10 +29,10 @@ import java.util.List; import java.util.UUID; import org.apache.commons.codec.binary.Base64; import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.domain.ODataGeospatialValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataGeospatialValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPropertyTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPropertyTest.java index a67f8b8b2..37f2688cd 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPropertyTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPropertyTest.java @@ -27,12 +27,12 @@ import java.io.IOException; import java.io.InputStream; import java.util.Iterator; import org.apache.commons.io.IOUtils; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractTest.java index 9133b0e1d..b579962b3 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractTest.java @@ -21,8 +21,8 @@ package org.apache.olingo.client.core; import java.util.Locale; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.custommonkey.xmlunit.XMLUnit; import org.junit.BeforeClass; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java index 1a30ef70f..5e7ea2f1a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java @@ -52,16 +52,16 @@ import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResp import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java index 294d190e4..21d37177a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java @@ -35,8 +35,8 @@ import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEnt import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Ignore; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/CountTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/CountTestITCase.java index 455d3768f..f004c26c7 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/CountTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/CountTestITCase.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; public class CountTestITCase extends AbstractTestITCase { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityCreateTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityCreateTestITCase.java index d16f060e4..8146830b5 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityCreateTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityCreateTestITCase.java @@ -39,12 +39,12 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe 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.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.NoContentException; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java index c05eaffca..609bd9a2d 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java @@ -30,13 +30,13 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe 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.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.op.ResourceFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java index fa0d60f27..aaa9ed7f8 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java @@ -28,9 +28,9 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe 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.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.op.ResourceFactory; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityUpdateTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityUpdateTestITCase.java index 6e918e968..129f086a8 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityUpdateTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityUpdateTestITCase.java @@ -31,8 +31,8 @@ import org.apache.olingo.client.api.communication.request.UpdateType; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java index a61b853df..ed8a776a0 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java @@ -32,8 +32,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java index ece7364c8..28c354d96 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.core.it.v3; -import org.apache.olingo.client.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.api.uri.v3.FilterArgFactory; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java index a2d9a90d6..cbcf046cd 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.core.it.v3; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertEquals; -import org.apache.olingo.client.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/KeyAsSegmentTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/KeyAsSegmentTestITCase.java index 1a3123b62..9c2a9f5f6 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/KeyAsSegmentTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/KeyAsSegmentTestITCase.java @@ -21,8 +21,8 @@ package org.apache.olingo.client.core.it.v3; import org.apache.olingo.client.api.communication.request.UpdateType; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/LinkTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/LinkTestITCase.java index a296f9462..b56dde693 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/LinkTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/LinkTestITCase.java @@ -32,9 +32,9 @@ import org.apache.olingo.client.api.communication.request.cud.ODataLinkUpdateReq import org.apache.olingo.client.api.communication.request.retrieve.v3.ODataLinkCollectionRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/MediaEntityTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/MediaEntityTestITCase.java index 33446cf3e..33502045a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/MediaEntityTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/MediaEntityTestITCase.java @@ -36,10 +36,10 @@ 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.api.communication.response.ODataStreamUpdateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataMediaFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/NavigationLinkCreateTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/NavigationLinkCreateTestITCase.java index a1a90f999..b1e385dc1 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/NavigationLinkCreateTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/NavigationLinkCreateTestITCase.java @@ -38,16 +38,16 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe 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.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/OpenTypeTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/OpenTypeTestITCase.java index 2d06ba058..091d0af80 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/OpenTypeTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/OpenTypeTestITCase.java @@ -28,9 +28,9 @@ import java.util.UUID; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java index d69fb6838..c6763e98e 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java @@ -25,8 +25,8 @@ import java.math.BigDecimal; import java.util.UUID; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.junit.Test; public class PrimitiveKeysTestITCase extends AbstractTestITCase { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyRetrieveTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyRetrieveTestITCase.java index 331c73bd4..314e93416 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyRetrieveTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyRetrieveTestITCase.java @@ -29,13 +29,13 @@ 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.request.retrieve.ODataPropertyRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java index 56eb4fbd9..28d487f74 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java @@ -35,11 +35,11 @@ import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateRe import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyValueTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyValueTestITCase.java index 1acb6be34..b8dd0a831 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyValueTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyValueTestITCase.java @@ -24,9 +24,9 @@ import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java index 350148248..d34da8884 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java @@ -29,10 +29,10 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe 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.data.Entry; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.v3.URIBuilder.InlineCount; import org.apache.olingo.client.core.data.AtomEntryImpl; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentRetrieveTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentRetrieveTestITCase.java index 40a7ecf24..f5a9fa9d5 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentRetrieveTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentRetrieveTestITCase.java @@ -23,8 +23,8 @@ import java.net.URI; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; public class ServiceDocumentRetrieveTestITCase extends AbstractTestITCase { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentTestITCase.java index 820b3a058..0a5aefc6a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentTestITCase.java @@ -23,8 +23,8 @@ import static org.junit.Assert.assertEquals; import java.net.URI; import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; public class ServiceDocumentTestITCase extends AbstractTestITCase { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/AtomTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/AtomTest.java index 6963cee56..755b44b59 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/AtomTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/AtomTest.java @@ -29,8 +29,8 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.client.core.AtomLinksQualifier; import org.custommonkey.xmlunit.Diff; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java index d33da3bb7..792ddb750 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java @@ -24,8 +24,8 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.InputStream; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.client.core.op.ResourceFactory; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java index 978da522c..d8f02a6d1 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java @@ -24,10 +24,10 @@ import static org.junit.Assert.assertTrue; import java.io.InputStream; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.client.core.op.ResourceFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java index b76c45300..57f35164a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.data.ODataError; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java index 83c7d05c0..d57c561bb 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; public class JSONTest extends AtomTest { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java index d950d2e5c..e3cbd7ec6 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java @@ -32,7 +32,7 @@ import java.util.TimeZone; import java.util.UUID; import javax.xml.datatype.Duration; import org.apache.commons.codec.binary.Base64; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ServiceDocumentTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ServiceDocumentTest.java index b42b5131d..dd49fecf7 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ServiceDocumentTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ServiceDocumentTest.java @@ -19,8 +19,8 @@ package org.apache.olingo.client.core.v3; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.core.AbstractTest; import static org.junit.Assert.assertNotNull; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java index d879e5b44..0fc9b18ac 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java @@ -22,7 +22,7 @@ import java.util.Calendar; import static org.junit.Assert.assertEquals; import org.apache.olingo.client.api.v4.ODataClient; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java index 7945692da..4dc4faec0 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java @@ -25,8 +25,8 @@ import static org.junit.Assert.assertTrue; import java.net.URI; import org.apache.olingo.client.api.v4.ODataClient; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.core.AbstractTest; import org.junit.Test; diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml index e398eaa88..4b7546933 100644 --- a/lib/commons-api/pom.xml +++ b/lib/commons-api/pom.xml @@ -39,6 +39,11 @@ org.apache.commons commons-lang3 + + + org.slf4j + slf4j-api + diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/AbstractODataValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/AbstractODataValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java index 37ca0da2b..ab77d7fa8 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/AbstractODataValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataCollectionValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataCollectionValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java index df743df70..f5831871d 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataCollectionValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.util.ArrayList; import java.util.Iterator; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataComplexValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataComplexValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java index d9b8a2478..b97371898 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataComplexValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java similarity index 99% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntity.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java index e06ca625a..6f84e4bf7 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntity.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import java.util.ArrayList; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySet.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java index 22aff1fce..d3b146d99 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySet.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import java.util.ArrayList; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataGeospatialValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataGeospatialValue.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataGeospatialValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataGeospatialValue.java index af1c54532..756390719 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataGeospatialValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataGeospatialValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import org.apache.olingo.commons.api.edm.EdmGeospatialType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntity.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java index 0d030e006..46e29dd2b 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntity.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntitySet.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java index 331839c93..1ace20bc0 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntitySet.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInvokeResult.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInvokeResult.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java index c55dfe66b..d4b8c44fd 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInvokeResult.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; /** * Marker interface for any OData domain object that can be returned by an operation invocation. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataItem.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataItem.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java index f427aa6b1..b40eeb785 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataItem.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.io.Serializable; import java.net.URI; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLink.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLink.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLink.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLink.java index 11005a7cf..9e6845427 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLink.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLink.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLinkType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLinkType.java similarity index 90% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLinkType.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLinkType.java index 6702c006e..59dc8348f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLinkType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLinkType.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import org.apache.commons.lang3.StringUtils; -import org.apache.http.entity.ContentType; -import org.apache.olingo.client.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.api.format.ContentType; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * OData link types. @@ -39,7 +39,7 @@ public enum ODataLinkType { /** * Association link. */ - ASSOCIATION(ContentType.APPLICATION_XML.getMimeType()), + ASSOCIATION(ContentType.APPLICATION_XML), /** * Media-edit link. */ @@ -59,7 +59,7 @@ public enum ODataLinkType { /** * Gets LinkType instance from the given rel and type. * - * @param client OData client. + * @param version OData protocol version. * @param rel rel. * @param type type. * @return ODataLinkType object. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataObjectFactory.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java similarity index 99% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataObjectFactory.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java index ddafea4cf..b38a5e8af 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataObjectFactory.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataOperation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataOperation.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataOperation.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataOperation.java index c18260fd9..47daba496 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataOperation.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataOperation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.io.Serializable; import java.net.URI; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPrimitiveValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPrimitiveValue.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPrimitiveValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPrimitiveValue.java index a615eed87..77e83ae48 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPrimitiveValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPrimitiveValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataProperty.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java index 440b461bd..721728286 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataProperty.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.io.Serializable; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPropertyType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPropertyType.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPropertyType.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPropertyType.java index 356596fea..d173e50bb 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPropertyType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPropertyType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; public enum ODataPropertyType { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataServiceDocument.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataServiceDocument.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataServiceDocument.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataServiceDocument.java index d0f495dd3..13f807b92 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataServiceDocument.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataServiceDocument.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import java.util.Collection; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java index d56f18889..e1c9be99c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.io.Serializable; diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java new file mode 100644 index 000000000..21ed548c5 --- /dev/null +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.commons.api.format; + +public interface ContentType { + + public static final String APPLICATION_ATOM_XML = "application/atom+xml"; + + public static final String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded"; + + public static final String APPLICATION_JSON = "application/json"; + + public static final String APPLICATION_OCTET_STREAM = "application/octet-stream"; + + public static final String APPLICATION_SVG_XML = "application/svg+xml"; + + public static final String APPLICATION_XHTML_XML = "application/xhtml+xml"; + + public static final String APPLICATION_XML = "application/xml"; + + public static final String MULTIPART_FORM_DATA = "multipart/form-data"; + + public static final String TEXT_HTML = "text/html"; + + public static final String TEXT_PLAIN = "text/plain"; + + public static final String TEXT_XML = "text/xml"; + + public static final String WILDCARD = "*/*"; + +} diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java similarity index 82% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataFormat.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java index 2ee704b33..30d9e0946 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.format; - -import org.apache.http.entity.ContentType; +package org.apache.olingo.commons.api.format; /** * Available formats to be used in various contexts. @@ -28,19 +26,19 @@ public enum ODataFormat { /** * JSON format with no metadata. */ - JSON_NO_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=nometadata"), + JSON_NO_METADATA(ContentType.APPLICATION_JSON + ";odata=nometadata"), /** * JSON format with minimal metadata (default). */ - JSON(ContentType.APPLICATION_JSON.getMimeType() + ";odata=minimalmetadata"), + JSON(ContentType.APPLICATION_JSON + ";odata=minimalmetadata"), /** * JSON format with no metadata. */ - JSON_FULL_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=fullmetadata"), + JSON_FULL_METADATA(ContentType.APPLICATION_JSON + ";odata=fullmetadata"), /** * XML format. */ - XML(ContentType.APPLICATION_XML.getMimeType()); + XML(ContentType.APPLICATION_XML); private final String format; @@ -71,7 +69,7 @@ public enum ODataFormat { final String[] parts = format.split(";"); _format.append(parts[0].trim()); - if (ContentType.APPLICATION_JSON.getMimeType().equals(parts[0].trim())) { + if (ContentType.APPLICATION_JSON.equals(parts[0].trim())) { if (parts.length > 1) { _format.append(';').append(parts[1].trim()); } else { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataMediaFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataMediaFormat.java similarity index 67% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataMediaFormat.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataMediaFormat.java index 353edc440..c479de44c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataMediaFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataMediaFormat.java @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.format; - -import org.apache.http.entity.ContentType; +package org.apache.olingo.commons.api.format; /** * Available formats for media. @@ -27,18 +25,18 @@ public enum ODataMediaFormat { CHARSET_PARAMETER("charset"), MEDIA_TYPE_WILDCARD("*"), - WILDCARD("*/*"), - APPLICATION_XML(ContentType.APPLICATION_XML.getMimeType()), - APPLICATION_ATOM_XML(ContentType.APPLICATION_ATOM_XML.getMimeType()), - APPLICATION_XHTML_XML(ContentType.APPLICATION_XHTML_XML.getMimeType()), - APPLICATION_SVG_XML(ContentType.APPLICATION_SVG_XML.getMimeType()), - APPLICATION_JSON(ContentType.APPLICATION_JSON.getMimeType()), - APPLICATION_FORM_URLENCODED(ContentType.APPLICATION_FORM_URLENCODED.getMimeType()), - MULTIPART_FORM_DATA(ContentType.MULTIPART_FORM_DATA.getMimeType()), - APPLICATION_OCTET_STREAM(ContentType.APPLICATION_OCTET_STREAM.getMimeType()), - TEXT_PLAIN(ContentType.TEXT_PLAIN.getMimeType()), - TEXT_XML(ContentType.TEXT_XML.getMimeType()), - TEXT_HTML(ContentType.TEXT_HTML.getMimeType()); + WILDCARD(ContentType.WILDCARD), + APPLICATION_XML(ContentType.APPLICATION_XML), + APPLICATION_ATOM_XML(ContentType.APPLICATION_ATOM_XML), + APPLICATION_XHTML_XML(ContentType.APPLICATION_XHTML_XML), + APPLICATION_SVG_XML(ContentType.APPLICATION_SVG_XML), + APPLICATION_JSON(ContentType.APPLICATION_JSON), + APPLICATION_FORM_URLENCODED(ContentType.APPLICATION_FORM_URLENCODED), + MULTIPART_FORM_DATA(ContentType.MULTIPART_FORM_DATA), + APPLICATION_OCTET_STREAM(ContentType.APPLICATION_OCTET_STREAM), + TEXT_PLAIN(ContentType.TEXT_PLAIN), + TEXT_XML(ContentType.TEXT_XML), + TEXT_HTML(ContentType.TEXT_HTML); private final String format; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataPubFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataPubFormat.java similarity index 82% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataPubFormat.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataPubFormat.java index 62e5322cd..6cd6a050f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataPubFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataPubFormat.java @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.format; - -import org.apache.http.entity.ContentType; +package org.apache.olingo.commons.api.format; /** * Available formats for AtomPub exchange. @@ -28,19 +26,19 @@ public enum ODataPubFormat { /** * JSON format with no metadata. */ - JSON_NO_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=nometadata"), + JSON_NO_METADATA(ContentType.APPLICATION_JSON + ";odata=nometadata"), /** * JSON format with minimal metadata (default). */ - JSON(ContentType.APPLICATION_JSON.getMimeType() + ";odata=minimalmetadata"), + JSON(ContentType.APPLICATION_JSON + ";odata=minimalmetadata"), /** * JSON format with no metadata. */ - JSON_FULL_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=fullmetadata"), + JSON_FULL_METADATA(ContentType.APPLICATION_JSON + ";odata=fullmetadata"), /** * Atom format. */ - ATOM(ContentType.APPLICATION_ATOM_XML.getMimeType()); + ATOM(ContentType.APPLICATION_ATOM_XML); private final String format; @@ -71,7 +69,7 @@ public enum ODataPubFormat { final String[] parts = format.split(";"); _format.append(parts[0].trim()); - if (ContentType.APPLICATION_JSON.getMimeType().equals(parts[0].trim())) { + if (ContentType.APPLICATION_JSON.equals(parts[0].trim())) { if (parts.length > 1 && parts[1].startsWith("odata=")) { _format.append(';').append(parts[1].trim()); } else { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataValueFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataValueFormat.java similarity index 90% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataValueFormat.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataValueFormat.java index b04ce7d4b..1b290bf6e 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataValueFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataValueFormat.java @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.format; - -import org.apache.http.entity.ContentType; +package org.apache.olingo.commons.api.format; /** * Available formats for property values. @@ -28,11 +26,11 @@ public enum ODataValueFormat { /** * Application octet stream. */ - STREAM(ContentType.APPLICATION_OCTET_STREAM.getMimeType()), + STREAM(ContentType.APPLICATION_OCTET_STREAM), /** * Plain text format. */ - TEXT(ContentType.TEXT_PLAIN.getMimeType()); + TEXT(ContentType.TEXT_PLAIN); private final String format;