Repository: olingo-odata4 Updated Branches: refs/heads/master 55c7d1073 -> f38d54dcf
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java index 5ad865e..8366304 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.core.communication.request.retrieve; import java.net.URI; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.EdmMetadataRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.edm.xml.XMLMetadata; @@ -36,7 +36,7 @@ class EdmMetadataRequestImpl extends AbstractMetadataRequestImpl<Edm> implements private EdmMetadataResponseImpl privateResponse; - EdmMetadataRequestImpl(final CommonODataClient<?> odataClient, final String serviceRoot, final URI uri) { + EdmMetadataRequestImpl(final ODataClient odataClient, final String serviceRoot, final URI uri) { super(odataClient, uri); this.serviceRoot = serviceRoot; } @@ -67,7 +67,7 @@ class EdmMetadataRequestImpl extends AbstractMetadataRequestImpl<Edm> implements private XMLMetadata metadata = null; - private EdmMetadataResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private EdmMetadataResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final ODataRetrieveResponse<XMLMetadata> xmlMetadataResponse) { super(odataClient, httpClient, null); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java index 7b818e1..bb3ccd9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java @@ -23,7 +23,6 @@ import java.net.URI; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataDeltaRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; @@ -37,7 +36,7 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException; public class ODataDeltaRequestImpl extends AbstractODataRetrieveRequest<ODataDelta> implements ODataDeltaRequest { - public ODataDeltaRequestImpl(final CommonODataClient<?> odataClient, final URI query) { + public ODataDeltaRequestImpl(final ODataClient odataClient, final URI query) { super(odataClient, query); } @@ -56,7 +55,7 @@ public class ODataDeltaRequestImpl extends AbstractODataRetrieveRequest<ODataDel private ODataDelta delta = null; - private ODataDeltaResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataDeltaResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java ---------------------------------------------------------------------- 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 f867bc6..f247ec9 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 @@ -22,7 +22,7 @@ import java.net.URI; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.commons.api.data.Entity; @@ -43,7 +43,7 @@ public class ODataEntityRequestImpl<E extends ODataEntity> * @param odataClient client instance getting this request * @param query query to be executed. */ - public ODataEntityRequestImpl(final CommonODataClient<?> odataClient, final URI query) { + public ODataEntityRequestImpl(final ODataClient odataClient, final URI query) { super(odataClient, query); } @@ -64,7 +64,7 @@ public class ODataEntityRequestImpl<E extends ODataEntity> private E entity = null; - private ODataEntityResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataEntityResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java ---------------------------------------------------------------------- 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 8b99b44..737305b 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 @@ -22,7 +22,7 @@ import java.net.URI; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; 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; @@ -45,7 +45,7 @@ public class ODataEntitySetIteratorRequestImpl<ES extends ODataEntitySet, E exte * @param odataClient client instance getting this request * @param query query to be executed. */ - public ODataEntitySetIteratorRequestImpl(final CommonODataClient<?> odataClient, final URI query) { + public ODataEntitySetIteratorRequestImpl(final ODataClient odataClient, final URI query) { super(odataClient, query); } @@ -65,7 +65,7 @@ public class ODataEntitySetIteratorRequestImpl<ES extends ODataEntitySet, E exte */ protected class ODataEntitySetIteratorResponseImpl extends AbstractODataRetrieveResponse { - private ODataEntitySetIteratorResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataEntitySetIteratorResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java ---------------------------------------------------------------------- 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 0214dec..d552e75 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 @@ -22,7 +22,7 @@ import java.net.URI; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.commons.api.data.EntitySet; @@ -47,7 +47,7 @@ public class ODataEntitySetRequestImpl<ES extends ODataEntitySet> * @param odataClient client instance getting this request * @param query query to be executed. */ - public ODataEntitySetRequestImpl(final CommonODataClient<?> odataClient, final URI query) { + public ODataEntitySetRequestImpl(final ODataClient odataClient, final URI query) { super(odataClient, query); } @@ -67,7 +67,7 @@ public class ODataEntitySetRequestImpl<ES extends ODataEntitySet> */ protected class ODataEntitySetResponseImpl extends AbstractODataRetrieveResponse { - private ODataEntitySetResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataEntitySetResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java ---------------------------------------------------------------------- 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 c24f80a..bcffc59 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 @@ -24,7 +24,7 @@ import java.net.URI; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; 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; @@ -42,7 +42,7 @@ public class ODataMediaRequestImpl extends AbstractODataRetrieveRequest<InputStr * @param odataClient client instance getting this request * @param query query to be executed. */ - ODataMediaRequestImpl(final CommonODataClient<?> odataClient, final URI query) { + ODataMediaRequestImpl(final ODataClient odataClient, final URI query) { super(odataClient, query); setAccept(ODataFormat.APPLICATION_OCTET_STREAM.toString()); @@ -71,7 +71,7 @@ public class ODataMediaRequestImpl extends AbstractODataRetrieveRequest<InputStr private InputStream input = null; - private ODataMediaResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataMediaResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java ---------------------------------------------------------------------- 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 e8c6797..07f753b 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 @@ -23,7 +23,7 @@ import java.net.URI; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; 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.http.HttpClientException; @@ -45,7 +45,7 @@ public class ODataPropertyRequestImpl<T extends ODataProperty> * @param odataClient client instance getting this request * @param query query to be executed. */ - public ODataPropertyRequestImpl(final CommonODataClient<?> odataClient, final URI query) { + public ODataPropertyRequestImpl(final ODataClient odataClient, final URI query) { super(odataClient, query); } @@ -64,7 +64,7 @@ public class ODataPropertyRequestImpl<T extends ODataProperty> private T property = null; - private ODataPropertyResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataPropertyResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java ---------------------------------------------------------------------- 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 646cd6a..4c22c31 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 @@ -25,7 +25,7 @@ import java.net.URI; import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.core.communication.request.AbstractODataRequest; @@ -46,7 +46,7 @@ public class ODataRawRequestImpl extends AbstractODataRequest implements ODataRa * @param odataClient client instance getting this request * @param uri request URI. */ - ODataRawRequestImpl(final CommonODataClient<?> odataClient, final URI uri) { + ODataRawRequestImpl(final ODataClient odataClient, final URI uri) { super(odataClient, HttpMethod.GET, uri); } @@ -70,7 +70,7 @@ public class ODataRawRequestImpl extends AbstractODataRequest implements ODataRa private byte[] obj = null; - private ODataRawResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataRawResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java ---------------------------------------------------------------------- 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 21dabf9..ce2f477 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 @@ -22,7 +22,7 @@ import java.net.URI; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; 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.data.ServiceDocument; @@ -43,7 +43,7 @@ public class ODataServiceDocumentRequestImpl extends AbstractODataRetrieveReques * @param odataClient client instance getting this request * @param uri request URI. */ - ODataServiceDocumentRequestImpl(final CommonODataClient<?> odataClient, final URI uri) { + ODataServiceDocumentRequestImpl(final ODataClient odataClient, final URI uri) { super(odataClient, uri); } @@ -65,7 +65,7 @@ public class ODataServiceDocumentRequestImpl extends AbstractODataRetrieveReques private ODataServiceDocument serviceDocument = null; - private ODataServiceResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataServiceResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java ---------------------------------------------------------------------- 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 f417e5d..ffb2caf 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 @@ -23,7 +23,7 @@ import java.net.URI; import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; 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.http.HttpClientException; @@ -43,7 +43,7 @@ public class ODataValueRequestImpl extends AbstractODataRetrieveRequest<ODataPri * @param odataClient client instance getting this request * @param query query to be executed. */ - ODataValueRequestImpl(final CommonODataClient<?> odataClient, final URI query) { + ODataValueRequestImpl(final ODataClient odataClient, final URI query) { super(odataClient, query); } @@ -65,7 +65,7 @@ public class ODataValueRequestImpl extends AbstractODataRetrieveRequest<ODataPri private ODataPrimitiveValue value = null; - private ODataValueResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataValueResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java index ff2b0ea..1f41887 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java @@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpUriRequest; -import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.XMLMetadataRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; @@ -133,7 +132,7 @@ public class XMLMetadataRequestImpl * main metadata document's URI but don't have to start with the service root * as all other OData request URIs. */ @Override - protected void checkRequest(final CommonODataClient<?> odataClient, final HttpUriRequest request) { + protected void checkRequest(final ODataClient odataClient, final HttpUriRequest request) { if (parentURI == null) { super.checkRequest(odataClient, request); } else { @@ -173,7 +172,7 @@ public class XMLMetadataRequestImpl private final XMLMetadata metadata; - private XMLMetadataResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private XMLMetadataResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res, final XMLMetadata metadata) { super(odataClient, httpClient, null); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedEntityRequest.java ---------------------------------------------------------------------- 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 e0969d2..0242674 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 @@ -20,7 +20,7 @@ package org.apache.olingo.client.core.communication.request.streamed; import java.net.URI; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.ODataPayloadManager; import org.apache.olingo.client.api.communication.request.streamed.ODataStreamedEntityRequest; import org.apache.olingo.client.api.communication.response.ODataResponse; @@ -46,7 +46,7 @@ public abstract class AbstractODataStreamedEntityRequest<V extends ODataResponse * @param method HTTP request method. * @param uri request URI. */ - public AbstractODataStreamedEntityRequest(final CommonODataClient<?> odataClient, final HttpMethod method, + public AbstractODataStreamedEntityRequest(final ODataClient odataClient, final HttpMethod method, final URI uri) { super(odataClient, method, uri); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java ---------------------------------------------------------------------- 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 52b992d..e01e508 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 @@ -28,12 +28,12 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.ODataBatchConstants; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.ODataPayloadManager; 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.CommonODataBatchRequest; +import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest; import org.apache.olingo.client.api.communication.response.ODataResponse; import org.apache.olingo.client.core.communication.request.AbstractODataRequest; import org.apache.olingo.client.core.communication.request.Wrapper; @@ -69,7 +69,7 @@ public abstract class AbstractODataStreamedRequest<V extends ODataResponse, T ex * @param method OData request HTTP method. * @param uri OData request URI. */ - public AbstractODataStreamedRequest(final CommonODataClient<?> odataClient, + public AbstractODataStreamedRequest(final ODataClient odataClient, final HttpMethod method, final URI uri) { super(odataClient, method, uri); @@ -130,7 +130,7 @@ public abstract class AbstractODataStreamedRequest<V extends ODataResponse, T ex * * @param req destination batch request. */ - public void batch(final CommonODataBatchRequest req) { + public void batch(final ODataBatchRequest req) { batch(req, null); } @@ -142,7 +142,7 @@ public abstract class AbstractODataStreamedRequest<V extends ODataResponse, T ex * @param req destination batch request. * @param contentId ContentId header value to be added to the serialization. Use this in case of changeset items. */ - public void batch(final CommonODataBatchRequest req, final String contentId) { + public void batch(final ODataBatchRequest req, final String contentId) { final InputStream input = getPayloadManager().getBody(); try { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java ---------------------------------------------------------------------- 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 3ef64c2..8f1fede 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 @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; 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; @@ -54,7 +54,7 @@ public class ODataMediaEntityCreateRequestImpl<E extends ODataEntity> * @param targetURI target entity set. * @param media media entity blob to be created. */ - public ODataMediaEntityCreateRequestImpl(final CommonODataClient<?> odataClient, final URI targetURI, + public ODataMediaEntityCreateRequestImpl(final ODataClient odataClient, final URI targetURI, final InputStream media) { super(odataClient, HttpMethod.POST, targetURI); @@ -99,7 +99,7 @@ public class ODataMediaEntityCreateRequestImpl<E extends ODataEntity> private E entity = null; - private ODataMediaEntityCreateResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataMediaEntityCreateResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java ---------------------------------------------------------------------- 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 aa79b36..5e98d43 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 @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; 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; @@ -55,7 +55,7 @@ public class ODataMediaEntityUpdateRequestImpl<E extends ODataEntity> * @param editURI edit URI of the entity to be updated. * @param media media entity blob to be created. */ - public ODataMediaEntityUpdateRequestImpl(final CommonODataClient<?> odataClient, + public ODataMediaEntityUpdateRequestImpl(final ODataClient odataClient, final HttpMethod method, final URI editURI, final InputStream media) { super(odataClient, method, editURI); @@ -100,7 +100,7 @@ public class ODataMediaEntityUpdateRequestImpl<E extends ODataEntity> private E entity = null; - private ODataMediaEntityUpdateResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataMediaEntityUpdateResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java index 3e9b6e1..ca385a9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest; import org.apache.olingo.client.api.communication.request.streamed.StreamUpdateStreamManager; import org.apache.olingo.client.api.communication.response.ODataStreamUpdateResponse; @@ -49,7 +49,7 @@ public class ODataStreamUpdateRequestImpl * @param targetURI target URI. * @param stream stream to be updated. */ - public ODataStreamUpdateRequestImpl(final CommonODataClient<?> odataClient, + public ODataStreamUpdateRequestImpl(final ODataClient odataClient, final HttpMethod method, final URI targetURI, final InputStream stream) { super(odataClient, method, targetURI); @@ -97,7 +97,7 @@ public class ODataStreamUpdateRequestImpl private InputStream input = null; - private ODataStreamUpdateResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + private ODataStreamUpdateResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java index 4e8ba49..210ae7c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java @@ -34,7 +34,7 @@ import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.ODataStreamer; import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator; @@ -58,7 +58,7 @@ public abstract class AbstractODataResponse implements ODataResponse { */ protected static final Logger LOG = LoggerFactory.getLogger(ODataResponse.class); - protected final CommonODataClient<?> odataClient; + protected final ODataClient odataClient; /** * HTTP client. @@ -102,7 +102,7 @@ public abstract class AbstractODataResponse implements ODataResponse { protected ODataBatchController batchInfo = null; public AbstractODataResponse( - final CommonODataClient<?> odataClient, final HttpClient httpclient, final HttpResponse res) { + final ODataClient odataClient, final HttpClient httpclient, final HttpResponse res) { this.odataClient = odataClient; this.httpClient = httpclient; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AsyncResponseImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AsyncResponseImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AsyncResponseImpl.java index 6f012c8..9ca884c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AsyncResponseImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AsyncResponseImpl.java @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator; import org.apache.olingo.client.api.communication.response.AsyncResponse; import org.apache.olingo.client.core.communication.request.batch.ODataBatchController; @@ -33,7 +33,7 @@ import org.apache.olingo.client.core.communication.request.batch.ODataBatchContr */ public class AsyncResponseImpl extends AbstractODataResponse implements AsyncResponse { - public AsyncResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient, + public AsyncResponseImpl(final ODataClient odataClient, final HttpClient httpClient, final HttpResponse res) { super(odataClient, httpClient, res); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java index 22b1798..c6a5171 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java @@ -23,7 +23,6 @@ import java.net.URI; import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; @@ -55,9 +54,9 @@ public class ODataReaderImpl implements ODataReader { */ protected static final Logger LOG = LoggerFactory.getLogger(ODataReaderImpl.class); - protected final CommonODataClient<?> client; + protected final ODataClient client; - public ODataReaderImpl(final CommonODataClient<?> client) { + public ODataReaderImpl(final ODataClient client) { this.client = client; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java index 4a8827d..79f1f07 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java @@ -28,21 +28,21 @@ 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.ODataClient; import org.apache.olingo.client.api.serialization.ODataWriter; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.ODataEntity; -import org.apache.olingo.commons.api.domain.ODataProperty; 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.serialization.ODataSerializerException; public class ODataWriterImpl implements ODataWriter { - protected final CommonODataClient<?> client; + protected final ODataClient client; - public ODataWriterImpl(final CommonODataClient<?> client) { + public ODataWriterImpl(final ODataClient client) { this.client = client; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java index 6a83239..f60104e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java @@ -44,7 +44,7 @@ import org.apache.http.client.utils.URIBuilder; import org.apache.http.entity.AbstractHttpEntity; import org.apache.http.entity.ByteArrayEntity; import org.apache.http.entity.InputStreamEntity; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.WrappingHttpClientFactory; import org.apache.olingo.client.api.uri.SegmentType; @@ -351,7 +351,7 @@ public final class URIUtils { return value; } - public static boolean shouldUseRepeatableHttpBodyEntry(final CommonODataClient<?> client) { + public static boolean shouldUseRepeatableHttpBodyEntry(final ODataClient client) { // returns true for authentication request in case of http401 which needs retry so requires being repeatable. HttpClientFactory httpclientFactory = client.getConfiguration().getHttpClientFactory(); if (httpclientFactory instanceof BasicAuthHttpClientFactory) { @@ -366,7 +366,7 @@ public final class URIUtils { return false; } - public static HttpEntity buildInputStreamEntity(final CommonODataClient<?> client, final InputStream input) { + public static HttpEntity buildInputStreamEntity(final ODataClient client, final InputStream input) { AbstractHttpEntity entity; boolean useChunked = client.getConfiguration().isUseChuncked(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractTest.java ---------------------------------------------------------------------- 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 0dc980b..dc64494 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 @@ -18,16 +18,16 @@ */ package org.apache.olingo.client.core; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.commons.api.format.ODataFormat; import org.custommonkey.xmlunit.XMLUnit; import org.junit.BeforeClass; public abstract class AbstractTest { - protected static org.apache.olingo.client.api.ODataClient v4Client; + protected static ODataClient v4Client; - protected abstract CommonODataClient<?> getClient(); + protected abstract ODataClient getClient(); @BeforeClass public static void setUp() { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f38d54dc/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java index 309fc50..f18e36d 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java @@ -18,18 +18,18 @@ */ package org.apache.olingo.client.core; -import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import org.apache.olingo.client.api.ODataClient; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.junit.Test; + public class ODataClientTest { @Test public void before() { - CommonODataClient<?> client = ODataClientFactory.getV4(); + ODataClient client = ODataClientFactory.getV4(); assertNotNull(client); assertEquals(ODataServiceVersion.V40, client.getServiceVersion()); }
