You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/04/30 17:02:45 UTC
[32/50] [abbrv] olingo-odata4 git commit: [OLINGO-564] Renamed
'OData*' to 'Client*' classes
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataPropertyUpdateResponse.java
----------------------------------------------------------------------
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 ca2ad51..0739e37 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.commons.api.domain.ODataProperty;
+import org.apache.olingo.commons.api.domain.ClientProperty;
/**
* This class implements the response to an OData update entity property request.
@@ -32,5 +32,5 @@ public interface ODataPropertyUpdateResponse extends ODataResponse {
*
* @return updated object.
*/
- ODataProperty getBody();
+ ClientProperty getBody();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataValueUpdateResponse.java
----------------------------------------------------------------------
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 415ad07..c921c44 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.commons.api.domain.ODataPrimitiveValue;
+import org.apache.olingo.commons.api.domain.ClientPrimitiveValue;
/**
* This class implements the response to an OData update entity property request.
@@ -32,5 +32,5 @@ public interface ODataValueUpdateResponse extends ODataResponse {
*
* @return updated object.
*/
- ODataPrimitiveValue getBody();
+ ClientPrimitiveValue getBody();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java
index 0827165..fd8e4e6 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java
@@ -24,7 +24,7 @@ import java.util.List;
/**
* REST resource for an <tt>ODataServiceDocument</tt>.
*
- * @see org.apache.olingo.commons.api.domain.ODataServiceDocument
+ * @see org.apache.olingo.commons.api.domain.ClientServiceDocument
*/
public interface ServiceDocument {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java
----------------------------------------------------------------------
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 2944471..60fd352 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
@@ -33,8 +33,8 @@ import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataEntitySet;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import org.slf4j.Logger;
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
* @param <E> concrete ODataEntity implementation
* @param <ES> concrete ODataEntitySet implementation
*/
-public class ODataEntitySetIterator<ES extends ODataEntitySet, E extends ODataEntity>
+public class ODataEntitySetIterator<ES extends ClientEntitySet, E extends ClientEntity>
implements Iterator<E> {
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java
index 6dc57dd..9be8744 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java
@@ -25,12 +25,12 @@ import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataDelta;
-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;
+import org.apache.olingo.commons.api.domain.ClientDelta;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
+import org.apache.olingo.commons.api.domain.ClientLink;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientServiceDocument;
public interface ODataBinder {
@@ -40,7 +40,7 @@ public interface ODataBinder {
* @param entitySet OData entity set.
* @return {@link EntityCollection} object.
*/
- EntityCollection getEntitySet(ODataEntitySet entitySet);
+ EntityCollection getEntitySet(ClientEntitySet entitySet);
/**
* Gets an <tt>Entity</tt> from the given OData entity.
@@ -48,7 +48,7 @@ public interface ODataBinder {
* @param entity OData entity.
* @return {@link Entity} object.
*/
- Entity getEntity(ODataEntity entity);
+ Entity getEntity(ClientEntity entity);
/**
* Gets a <tt>Link</tt> from the given OData link.
@@ -56,7 +56,7 @@ public interface ODataBinder {
* @param link OData link.
* @return <tt>Link</tt> object.
*/
- Link getLink(ODataLink link);
+ Link getLink(ClientLink link);
/**
* Gets a <tt>Property</tt> from the given OData property.
@@ -64,7 +64,7 @@ public interface ODataBinder {
* @param property OData property.
* @return <tt>Property</tt> object.
*/
- Property getProperty(ODataProperty property);
+ Property getProperty(ClientProperty property);
/**
* Adds the given property to the given entity.
@@ -73,7 +73,7 @@ public interface ODataBinder {
* @param property OData property.
* @return whether add was successful or not.
*/
- boolean add(ODataEntity entity, ODataProperty property);
+ boolean add(ClientEntity entity, ClientProperty property);
/**
* Gets <tt>ODataServiceDocument</tt> from the given service document resource.
@@ -81,31 +81,31 @@ public interface ODataBinder {
* @param resource service document resource.
* @return <tt>ODataServiceDocument</tt> object.
*/
- ODataServiceDocument getODataServiceDocument(ServiceDocument resource);
+ ClientServiceDocument getODataServiceDocument(ServiceDocument resource);
/**
* Gets <tt>ODataEntitySet</tt> from the given entity set resource.
*
* @param resource entity set resource.
- * @return {@link org.apache.olingo.commons.api.domain.ODataEntitySet} object.
+ * @return {@link ClientEntitySet} object.
*/
- ODataEntitySet getODataEntitySet(ResWrap<EntityCollection> resource);
+ ClientEntitySet getODataEntitySet(ResWrap<EntityCollection> resource);
/**
* Gets <tt>ODataEntity</tt> from the given entity resource.
*
* @param resource entity resource.
- * @return {@link org.apache.olingo.commons.api.domain.ODataEntity} object.
+ * @return {@link ClientEntity} object.
*/
- ODataEntity getODataEntity(ResWrap<Entity> resource);
+ ClientEntity getODataEntity(ResWrap<Entity> resource);
/**
* Gets an <tt>ODataProperty</tt> from the given property resource.
*
* @param resource property resource.
- * @return {@link org.apache.olingo.commons.api.domain.ODataProperty} object.
+ * @return {@link ClientProperty} object.
*/
- ODataProperty getODataProperty(ResWrap<Property> resource);
+ ClientProperty getODataProperty(ResWrap<Property> resource);
- ODataDelta getODataDelta(ResWrap<Delta> resource);
+ ClientDelta getODataDelta(ResWrap<Delta> resource);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java
index 0634673..8519a66 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java
@@ -22,11 +22,11 @@ import java.io.InputStream;
import java.util.Map;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataEntitySet;
-import org.apache.olingo.commons.api.domain.ODataError;
-import org.apache.olingo.commons.api.domain.ODataProperty;
-import org.apache.olingo.commons.api.domain.ODataServiceDocument;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
+import org.apache.olingo.commons.api.domain.ClientError;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientServiceDocument;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.provider.CsdlSchema;
import org.apache.olingo.commons.api.format.ODataFormat;
@@ -65,7 +65,7 @@ public interface ODataReader {
* @return List of URIs.
* @throws ODataDeserializerException
*/
- ODataServiceDocument readServiceDocument(InputStream input, ODataFormat format) throws ODataDeserializerException;
+ ClientServiceDocument readServiceDocument(InputStream input, ODataFormat format) throws ODataDeserializerException;
/**
* De-Serializes a stream into an OData entity set.
@@ -75,7 +75,7 @@ public interface ODataReader {
* @return de-serialized entity set.
* @throws ODataDeserializerException
*/
- ODataEntitySet readEntitySet(InputStream input, ODataFormat format) throws ODataDeserializerException;
+ ClientEntitySet readEntitySet(InputStream input, ODataFormat format) throws ODataDeserializerException;
/**
* Parses a stream taking care to de-serializes the first OData entity found.
@@ -85,7 +85,7 @@ public interface ODataReader {
* @return entity de-serialized.
* @throws ODataDeserializerException
*/
- ODataEntity readEntity(InputStream input, ODataFormat format) throws ODataDeserializerException;
+ ClientEntity readEntity(InputStream input, ODataFormat format) throws ODataDeserializerException;
/**
* Parses a stream taking care to de-serialize the first OData entity property found.
@@ -95,7 +95,7 @@ public interface ODataReader {
* @return OData entity property de-serialized.
* @throws ODataDeserializerException
*/
- ODataProperty readProperty(InputStream input, ODataFormat format) throws ODataDeserializerException;
+ ClientProperty readProperty(InputStream input, ODataFormat format) throws ODataDeserializerException;
/**
* Parses a stream into an OData error.
@@ -105,7 +105,7 @@ public interface ODataReader {
* @return OData error.
* @throws ODataDeserializerException
*/
- ODataError readError(InputStream inputStream, ODataFormat format) throws ODataDeserializerException;
+ ClientError readError(InputStream inputStream, ODataFormat format) throws ODataDeserializerException;
/**
* Parses a stream into the object type specified by the given reference.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java
index 1686997..81f07a6 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java
@@ -23,9 +23,9 @@ import java.net.URI;
import java.util.Collection;
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.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientLink;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
@@ -46,7 +46,7 @@ public interface ODataWriter {
* @return stream of serialized objects.
* @throws ODataSerializerException
*/
- InputStream writeEntities(Collection<ODataEntity> entities, ODataFormat format)
+ InputStream writeEntities(Collection<ClientEntity> entities, ODataFormat format)
throws ODataSerializerException;
/**
@@ -57,7 +57,7 @@ public interface ODataWriter {
* @return stream of serialized object.
* @throws ODataSerializerException
*/
- InputStream writeEntity(ODataEntity entity, ODataFormat format)
+ InputStream writeEntity(ClientEntity entity, ODataFormat format)
throws ODataSerializerException;
/**
@@ -68,7 +68,7 @@ public interface ODataWriter {
* @return stream of serialized object.
* @throws ODataSerializerException
*/
- InputStream writeProperty(ODataProperty property, ODataFormat format)
+ InputStream writeProperty(ClientProperty property, ODataFormat format)
throws ODataSerializerException;
/**
@@ -79,7 +79,7 @@ public interface ODataWriter {
* @return stream of serialized object.
* @throws ODataSerializerException
*/
- InputStream writeLink(ODataLink link, ODataFormat format)
+ InputStream writeLink(ClientLink link, ODataFormat format)
throws ODataSerializerException;
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java
index e16b0d7..55d4169 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java
@@ -47,11 +47,11 @@ import org.apache.olingo.client.core.serialization.ODataReaderImpl;
import org.apache.olingo.client.core.serialization.ODataWriterImpl;
import org.apache.olingo.client.core.uri.FilterFactoryImpl;
import org.apache.olingo.client.core.uri.URIBuilderImpl;
-import org.apache.olingo.commons.api.domain.ODataObjectFactory;
+import org.apache.olingo.commons.api.domain.ClientObjectFactory;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataSerializer;
-import org.apache.olingo.commons.core.domain.ODataObjectFactoryImpl;
+import org.apache.olingo.commons.core.domain.ClientObjectFactoryImpl;
import org.apache.olingo.commons.core.serialization.AtomSerializer;
import org.apache.olingo.commons.core.serialization.JsonSerializer;
@@ -65,7 +65,7 @@ public class ODataClientImpl implements ODataClient {
private final ODataBinder binder = new ODataBinderImpl(this);
- private final ODataObjectFactory objectFactory = new ODataObjectFactoryImpl();
+ private final ClientObjectFactory objectFactory = new ClientObjectFactoryImpl();
private final AsyncRequestFactory asyncReqFact = new AsyncRequestFactoryImpl(this);
@@ -147,7 +147,7 @@ public class ODataClientImpl implements ODataClient {
}
@Override
- public ODataObjectFactory getObjectFactory() {
+ public ClientObjectFactory getObjectFactory() {
return objectFactory;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
index f1cc64a..717096d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java
@@ -25,7 +25,7 @@ import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.ODataServerErrorException;
import org.apache.olingo.commons.api.ODataRuntimeException;
-import org.apache.olingo.commons.api.domain.ODataError;
+import org.apache.olingo.commons.api.domain.ClientError;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import org.slf4j.Logger;
@@ -35,8 +35,8 @@ public final class ODataErrorResponseChecker {
protected static final Logger LOG = LoggerFactory.getLogger(ODataErrorResponseChecker.class);
- private static ODataError getGenericError(final int code, final String errorMsg) {
- final ODataError error = new ODataError();
+ private static ClientError getGenericError(final int code, final String errorMsg) {
+ final ClientError error = new ClientError();
error.setCode(String.valueOf(code));
error.setMessage(errorMsg);
return error;
@@ -53,7 +53,7 @@ public final class ODataErrorResponseChecker {
} else {
final ODataFormat format = accept.contains("xml") ? ODataFormat.XML : ODataFormat.JSON;
- ODataError error;
+ ClientError error;
try {
error = odataClient.getReader().readError(entity, format);
} catch (final RuntimeException e) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java
index 75c3076..be0960a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/CUDRequestFactoryImpl.java
@@ -38,10 +38,10 @@ import org.apache.olingo.client.core.communication.request.streamed.ODataMediaEn
import org.apache.olingo.client.core.communication.request.streamed.ODataStreamUpdateRequestImpl;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
-import org.apache.olingo.commons.api.domain.ODataProperty;
-import org.apache.olingo.commons.api.domain.ODataSingleton;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientPrimitiveValue;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientSingleton;
import org.apache.olingo.commons.api.http.HttpMethod;
public class CUDRequestFactoryImpl implements CUDRequestFactory {
@@ -53,14 +53,14 @@ public class CUDRequestFactoryImpl implements CUDRequestFactory {
}
@Override
- public <E extends ODataEntity> ODataEntityCreateRequest<E> getEntityCreateRequest(
+ public <E extends ClientEntity> ODataEntityCreateRequest<E> getEntityCreateRequest(
final URI targetURI, final E entity) {
return new ODataEntityCreateRequestImpl<E>(client, targetURI, entity);
}
@Override
- public <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
+ public <E extends ClientEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
final URI targetURI, final UpdateType type, final E changes) {
final ODataEntityUpdateRequest<E> req;
@@ -76,7 +76,7 @@ public class CUDRequestFactoryImpl implements CUDRequestFactory {
}
@Override
- public <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
+ public <E extends ClientEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
final UpdateType type, final E entity) {
if (entity.getEditLink() == null) {
@@ -97,7 +97,7 @@ public class CUDRequestFactoryImpl implements CUDRequestFactory {
@Override
public ODataValueUpdateRequest getValueUpdateRequest(
- final URI targetURI, final UpdateType type, final ODataPrimitiveValue value) {
+ final URI targetURI, final UpdateType type, final ClientPrimitiveValue value) {
final ODataValueUpdateRequest req;
@@ -113,7 +113,7 @@ public class CUDRequestFactoryImpl implements CUDRequestFactory {
@Override
public ODataPropertyUpdateRequest getPropertyPrimitiveValueUpdateRequest(
- final URI targetURI, final ODataProperty property) {
+ final URI targetURI, final ClientProperty property) {
if (!property.hasPrimitiveValue()) {
throw new IllegalArgumentException("A primitive value is required");
@@ -133,7 +133,7 @@ public class CUDRequestFactoryImpl implements CUDRequestFactory {
@Override
public ODataPropertyUpdateRequest getPropertyComplexValueUpdateRequest(
- final URI targetURI, final UpdateType type, final ODataProperty property) {
+ final URI targetURI, final UpdateType type, final ClientProperty property) {
if (!property.hasComplexValue()) {
throw new IllegalArgumentException("A complex value is required");
@@ -153,7 +153,7 @@ public class CUDRequestFactoryImpl implements CUDRequestFactory {
@Override
public ODataPropertyUpdateRequest getPropertyCollectionValueUpdateRequest(
- final URI targetURI, final ODataProperty property) {
+ final URI targetURI, final ClientProperty property) {
if (!property.hasCollectionValue()) {
throw new IllegalArgumentException("A collection value is required");
@@ -186,7 +186,7 @@ public class CUDRequestFactoryImpl implements CUDRequestFactory {
}
@Override
- public <E extends ODataEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest(
+ public <E extends ClientEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest(
final URI targetURI, final InputStream media) {
return new ODataMediaEntityCreateRequestImpl<E>(client, targetURI, media);
@@ -207,7 +207,7 @@ public class CUDRequestFactoryImpl implements CUDRequestFactory {
}
@Override
- public <E extends ODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest(
+ public <E extends ClientEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest(
final URI editURI, final InputStream media) {
final ODataMediaEntityUpdateRequest<E> req;
@@ -223,15 +223,15 @@ public class CUDRequestFactoryImpl implements CUDRequestFactory {
}
@Override
- public ODataEntityUpdateRequest<ODataSingleton> getSingletonUpdateRequest(
- final UpdateType type, final ODataSingleton entity) {
+ public ODataEntityUpdateRequest<ClientSingleton> getSingletonUpdateRequest(
+ final UpdateType type, final ClientSingleton entity) {
return getEntityUpdateRequest(type, entity);
}
@Override
- public ODataEntityUpdateRequest<ODataSingleton> getSingletonUpdateRequest(
- final URI targetURI, final UpdateType type, final ODataSingleton changes) {
+ public ODataEntityUpdateRequest<ClientSingleton> getSingletonUpdateRequest(
+ final URI targetURI, final UpdateType type, final ClientSingleton changes) {
return getEntityUpdateRequest(targetURI, type, changes);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java
----------------------------------------------------------------------
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 3dc08a4..86d5395 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
@@ -33,7 +33,7 @@ import org.apache.olingo.client.core.communication.response.AbstractODataRespons
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ClientEntity;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
@@ -44,7 +44,7 @@ import org.apache.olingo.commons.api.serialization.ODataSerializerException;
*
* @param <E> concrete ODataEntity implementation
*/
-public class ODataEntityCreateRequestImpl<E extends ODataEntity>
+public class ODataEntityCreateRequestImpl<E extends ClientEntity>
extends AbstractODataBasicRequest<ODataEntityCreateResponse<E>>
implements ODataEntityCreateRequest<E> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java
----------------------------------------------------------------------
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 d401496..b86e6ae 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
@@ -34,7 +34,7 @@ import org.apache.olingo.client.core.communication.response.AbstractODataRespons
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ClientEntity;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
@@ -45,7 +45,7 @@ import org.apache.olingo.commons.api.serialization.ODataSerializerException;
*
* @param <E> concrete ODataEntity implementation
*/
-public class ODataEntityUpdateRequestImpl<E extends ODataEntity>
+public class ODataEntityUpdateRequestImpl<E extends ClientEntity>
extends AbstractODataBasicRequest<ODataEntityUpdateResponse<E>>
implements ODataEntityUpdateRequest<E> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java
----------------------------------------------------------------------
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 50b423c..674a342 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
@@ -33,7 +33,7 @@ import org.apache.olingo.client.core.communication.response.AbstractODataRespons
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataProperty;
+import org.apache.olingo.commons.api.domain.ClientProperty;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
@@ -48,7 +48,7 @@ public class ODataPropertyUpdateRequestImpl extends AbstractODataBasicRequest<OD
/**
* Value to be created.
*/
- private final ODataProperty property;
+ private final ClientProperty property;
/**
* Constructor.
@@ -59,7 +59,7 @@ public class ODataPropertyUpdateRequestImpl extends AbstractODataBasicRequest<OD
* @param property value to be created.
*/
ODataPropertyUpdateRequestImpl(final ODataClient odataClient,
- final HttpMethod method, final URI targetURI, final ODataProperty property) {
+ final HttpMethod method, final URI targetURI, final ClientProperty property) {
super(odataClient, method, targetURI);
// set request body
@@ -97,7 +97,7 @@ public class ODataPropertyUpdateRequestImpl extends AbstractODataBasicRequest<OD
*/
private class ODataPropertyUpdateResponseImpl extends AbstractODataResponse implements ODataPropertyUpdateResponse {
- private ODataProperty resProperty = null;
+ private ClientProperty resProperty = null;
private ODataPropertyUpdateResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
@@ -106,7 +106,7 @@ public class ODataPropertyUpdateRequestImpl extends AbstractODataBasicRequest<OD
}
@Override
- public ODataProperty getBody() {
+ public ClientProperty getBody() {
if (resProperty == null) {
try {
final ResWrap<Property> resource = odataClient.getDeserializer(ODataFormat.fromString(getAccept())).
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java
----------------------------------------------------------------------
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 ddff3b9..a7dfb5f 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
@@ -32,7 +32,7 @@ import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.uri.URIUtils;
-import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
+import org.apache.olingo.commons.api.domain.ClientPrimitiveValue;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
@@ -46,7 +46,7 @@ public class ODataValueUpdateRequestImpl extends AbstractODataBasicRequest<OData
/**
* Value to be created.
*/
- private final ODataPrimitiveValue value;
+ private final ClientPrimitiveValue value;
/**
* Constructor.
@@ -57,7 +57,7 @@ public class ODataValueUpdateRequestImpl extends AbstractODataBasicRequest<OData
* @param value value to be created.
*/
ODataValueUpdateRequestImpl(final ODataClient odataClient,
- final HttpMethod method, final URI targetURI, final ODataPrimitiveValue value) {
+ final HttpMethod method, final URI targetURI, final ClientPrimitiveValue value) {
super(odataClient, method, targetURI);
// set request body
@@ -94,7 +94,7 @@ public class ODataValueUpdateRequestImpl extends AbstractODataBasicRequest<OData
*/
private class ODataValueUpdateResponseImpl extends AbstractODataResponse implements ODataValueUpdateResponse {
- private ODataPrimitiveValue resValue = null;
+ private ClientPrimitiveValue resValue = null;
private ODataValueUpdateResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
@@ -103,7 +103,7 @@ public class ODataValueUpdateRequestImpl extends AbstractODataBasicRequest<OData
}
@Override
- public ODataPrimitiveValue getBody() {
+ public ClientPrimitiveValue getBody() {
if (resValue == null) {
final ODataFormat format = ODataFormat.fromString(getAccept());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
index 7892239..e4d67b5 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
@@ -25,8 +25,8 @@ import java.util.Map;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.communication.request.invoke.EdmEnabledInvokeRequestFactory;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
-import org.apache.olingo.commons.api.domain.ODataInvokeResult;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientInvokeResult;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.edm.EdmAction;
import org.apache.olingo.commons.api.edm.EdmActionImport;
import org.apache.olingo.commons.api.edm.EdmEntityContainer;
@@ -46,7 +46,7 @@ public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInv
}
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getFunctionImportInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getFunctionImportInvokeRequest(
final String functionImportName) {
return getFunctionImportInvokeRequest(functionImportName, null);
@@ -54,8 +54,8 @@ public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInv
@Override
@SuppressWarnings("unchecked")
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getFunctionImportInvokeRequest(
- final String functionImportName, final Map<String, ODataValue> parameters) {
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getFunctionImportInvokeRequest(
+ final String functionImportName, final Map<String, ClientValue> parameters) {
EdmFunctionImport efi = null;
for (EdmSchema schema : edmClient.getCachedEdm().getSchemas()) {
@@ -82,7 +82,7 @@ public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInv
}
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getActionImportInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getActionImportInvokeRequest(
final String actionImportName) {
return getActionImportInvokeRequest(actionImportName, null);
@@ -90,8 +90,8 @@ public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInv
@Override
@SuppressWarnings("unchecked")
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getActionImportInvokeRequest(
- final String actionImportName, final Map<String, ODataValue> parameters) {
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getActionImportInvokeRequest(
+ final String actionImportName, final Map<String, ClientValue> parameters) {
EdmActionImport eai = null;
for (EdmSchema schema : edmClient.getCachedEdm().getSchemas()) {
@@ -111,7 +111,7 @@ public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInv
}
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getBoundFunctionInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getBoundFunctionInvokeRequest(
final URI bindingParameterURI, final FullQualifiedName functionName,
final FullQualifiedName bindingParameterTypeName, final Boolean isBindingParameterCollection) {
@@ -121,10 +121,10 @@ public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInv
@Override
@SuppressWarnings("unchecked")
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getBoundFunctionInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getBoundFunctionInvokeRequest(
final URI bindingParameterURI, final FullQualifiedName functionName,
final FullQualifiedName bindingParameterTypeName, final Boolean isBindingParameterCollection,
- final Map<String, ODataValue> parameters) {
+ final Map<String, ClientValue> parameters) {
final EdmFunction function = edmClient.getCachedEdm().getBoundFunction(
functionName, bindingParameterTypeName, isBindingParameterCollection,
@@ -141,7 +141,7 @@ public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInv
}
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getBoundActionInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getBoundActionInvokeRequest(
final URI bindingParameterURI, final FullQualifiedName actionName,
final FullQualifiedName bindingParameterTypeName, final Boolean isBindingParameterCollection) {
@@ -151,10 +151,10 @@ public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInv
@Override
@SuppressWarnings("unchecked")
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getBoundActionInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getBoundActionInvokeRequest(
final URI bindingParameterURI, final FullQualifiedName actionName,
final FullQualifiedName bindingParameterTypeName, final Boolean isBindingParameterCollection,
- final Map<String, ODataValue> parameters) {
+ final Map<String, ClientValue> parameters) {
final EdmAction action = edmClient.getCachedEdm().getBoundAction(
actionName, bindingParameterTypeName, isBindingParameterCollection);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java
----------------------------------------------------------------------
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 fdd0f27..75ee264 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
@@ -23,12 +23,12 @@ import java.util.Map;
import org.apache.olingo.client.api.communication.request.invoke.InvokeRequestFactory;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
-import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent;
-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.ODataInvokeResult;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.client.api.communication.request.invoke.ClientNoContent;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientInvokeResult;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.edm.EdmReturnType;
import org.apache.olingo.commons.api.edm.constants.EdmTypeKind;
import org.apache.olingo.commons.api.http.HttpMethod;
@@ -36,46 +36,46 @@ import org.apache.olingo.commons.api.http.HttpMethod;
public abstract class AbstractInvokeRequestFactory implements InvokeRequestFactory {
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getFunctionInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getFunctionInvokeRequest(
final URI uri, final Class<RES> resultRef) {
return getFunctionInvokeRequest(uri, resultRef, null);
}
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getFunctionInvokeRequest(
- final URI uri, final Class<RES> resultRef, final Map<String, ODataValue> parameters) {
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getFunctionInvokeRequest(
+ final URI uri, final Class<RES> resultRef, final Map<String, ClientValue> parameters) {
return getInvokeRequest(HttpMethod.GET, uri, resultRef, parameters);
}
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getActionInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getActionInvokeRequest(
final URI uri, final Class<RES> resultRef) {
return getActionInvokeRequest(uri, resultRef, null);
}
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getActionInvokeRequest(
- final URI uri, final Class<RES> resultRef, final Map<String, ODataValue> parameters) {
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getActionInvokeRequest(
+ final URI uri, final Class<RES> resultRef, final Map<String, ClientValue> parameters) {
return getInvokeRequest(HttpMethod.POST, uri, resultRef, parameters);
}
@SuppressWarnings("unchecked")
- protected <RES extends ODataInvokeResult> Class<RES> getResultReference(final EdmReturnType returnType) {
+ protected <RES extends ClientInvokeResult> Class<RES> getResultReference(final EdmReturnType returnType) {
Class<RES> result;
if (returnType == null) {
- result = (Class<RES>) ODataNoContent.class;
+ result = (Class<RES>) ClientNoContent.class;
} else {
if (returnType.isCollection() && returnType.getType().getKind() == EdmTypeKind.ENTITY) {
- result = (Class<RES>) ODataEntitySet.class;
+ result = (Class<RES>) ClientEntitySet.class;
} else if (!returnType.isCollection() && returnType.getType().getKind() == EdmTypeKind.ENTITY) {
- result = (Class<RES>) ODataEntity.class;
+ result = (Class<RES>) ClientEntity.class;
} else {
- result = (Class<RES>) ODataProperty.class;
+ result = (Class<RES>) ClientProperty.class;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java
index e9801cc..2f26161 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java
@@ -32,17 +32,17 @@ import org.apache.http.client.methods.HttpRequestBase;
import org.apache.olingo.client.api.ODataClient;
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.request.invoke.ClientNoContent;
import org.apache.olingo.client.api.communication.response.ODataInvokeResponse;
import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.uri.URIUtils;
-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.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
+import org.apache.olingo.commons.api.domain.ClientInvokeResult;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
@@ -51,7 +51,7 @@ import org.apache.olingo.commons.api.serialization.ODataSerializerException;
/**
* This class implements an OData invoke operation request.
*/
-public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
+public abstract class AbstractODataInvokeRequest<T extends ClientInvokeResult>
extends AbstractODataBasicRequest<ODataInvokeResponse<T>>
implements ODataInvokeRequest<T>, ODataBatchableRequest {
@@ -60,7 +60,7 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
/**
* Function parameters.
*/
- protected Map<String, ODataValue> parameters;
+ protected Map<String, ClientValue> parameters;
/**
* Constructor.
@@ -79,11 +79,11 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
super(odataClient, method, uri);
this.reference = reference;
- this.parameters = new LinkedHashMap<String, ODataValue>();
+ this.parameters = new LinkedHashMap<String, ClientValue>();
}
@Override
- public void setParameters(final Map<String, ODataValue> parameters) {
+ public void setParameters(final Map<String, ClientValue> parameters) {
this.parameters.clear();
if (parameters != null && !parameters.isEmpty()) {
this.parameters.putAll(parameters);
@@ -96,7 +96,7 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
}
private String getActualFormat(final ODataFormat format) {
- return ((ODataProperty.class.isAssignableFrom(reference) && format == ODataFormat.ATOM)
+ return ((ClientProperty.class.isAssignableFrom(reference) && format == ODataFormat.ATOM)
? ODataFormat.XML : format).getContentType().toContentTypeString();
}
@@ -113,9 +113,9 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
protected InputStream getPayload() {
if (!this.parameters.isEmpty() && this.method == HttpMethod.POST) {
// Additional, non-binding parameters MUST be sent as JSON
- final ODataEntity tmp = odataClient.getObjectFactory().newEntity(null);
- for (Map.Entry<String, ODataValue> param : parameters.entrySet()) {
- ODataProperty property = null;
+ final ClientEntity tmp = odataClient.getObjectFactory().newEntity(null);
+ for (Map.Entry<String, ClientValue> param : parameters.entrySet()) {
+ ClientProperty property = null;
if (param.getValue().isPrimitive()) {
property = odataClient.getObjectFactory().
@@ -190,18 +190,18 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
public T getBody() {
if (invokeResult == null) {
try {
- if (ODataNoContent.class.isAssignableFrom(reference)) {
- invokeResult = reference.cast(new ODataNoContent());
+ if (ClientNoContent.class.isAssignableFrom(reference)) {
+ invokeResult = reference.cast(new ClientNoContent());
} else {
// avoid getContent() twice:IllegalStateException: Content has been consumed
final InputStream responseStream = this.payload == null ? res.getEntity().getContent() : this.payload;
- if (ODataEntitySet.class.isAssignableFrom(reference)) {
+ if (ClientEntitySet.class.isAssignableFrom(reference)) {
invokeResult = reference.cast(odataClient.getReader().readEntitySet(responseStream,
ODataFormat.fromString(getContentType())));
- } else if (ODataEntity.class.isAssignableFrom(reference)) {
+ } else if (ClientEntity.class.isAssignableFrom(reference)) {
invokeResult = reference.cast(odataClient.getReader().readEntity(responseStream,
ODataFormat.fromString(getContentType())));
- } else if (ODataProperty.class.isAssignableFrom(reference)) {
+ } else if (ClientProperty.class.isAssignableFrom(reference)) {
invokeResult = reference.cast(odataClient.getReader().readProperty(responseStream,
ODataFormat.fromString(getContentType())));
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/EdmEnabledInvokeRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/EdmEnabledInvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/EdmEnabledInvokeRequestFactoryImpl.java
index 9f1aaae..27691c5 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/EdmEnabledInvokeRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/EdmEnabledInvokeRequestFactoryImpl.java
@@ -23,8 +23,8 @@ import java.util.Map;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
-import org.apache.olingo.commons.api.domain.ODataInvokeResult;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientInvokeResult;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.http.HttpMethod;
public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvokeRequestFactory {
@@ -37,9 +37,9 @@ public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvoke
}
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getInvokeRequest(
final HttpMethod method, final URI uri, final Class<RES> resultRef,
- final Map<String, ODataValue> parameters) {
+ final Map<String, ClientValue> parameters) {
final ODataInvokeRequest<RES> request = new ODataInvokeRequestImpl<RES>(edmClient, resultRef, method, uri);
if (parameters != null) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/InvokeRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/InvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/InvokeRequestFactoryImpl.java
index 315071e..7b8506c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/InvokeRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/InvokeRequestFactoryImpl.java
@@ -23,8 +23,8 @@ import java.util.Map;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
-import org.apache.olingo.commons.api.domain.ODataInvokeResult;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientInvokeResult;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.http.HttpMethod;
public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory {
@@ -36,9 +36,9 @@ public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory {
}
@Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getInvokeRequest(
+ public <RES extends ClientInvokeResult> ODataInvokeRequest<RES> getInvokeRequest(
final HttpMethod method, final URI uri, final Class<RES> resultRef,
- final Map<String, ODataValue> parameters) {
+ final Map<String, ClientValue> parameters) {
final ODataInvokeRequest<RES> request = new ODataInvokeRequestImpl<RES>(client, resultRef, method, uri);
if (parameters != null) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java
----------------------------------------------------------------------
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 ce49d47..adf2214 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
@@ -21,11 +21,11 @@ package org.apache.olingo.client.core.communication.request.invoke;
import java.net.URI;
import org.apache.olingo.client.api.ODataClient;
-import org.apache.olingo.commons.api.domain.ODataInvokeResult;
+import org.apache.olingo.commons.api.domain.ClientInvokeResult;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
-public class ODataInvokeRequestImpl<T extends ODataInvokeResult> extends AbstractODataInvokeRequest<T> {
+public class ODataInvokeRequestImpl<T extends ClientInvokeResult> extends AbstractODataInvokeRequest<T> {
private ODataFormat format;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 e01da68..4412ef0 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
@@ -29,11 +29,11 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse
import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.commons.api.data.Delta;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataDelta;
+import org.apache.olingo.commons.api.domain.ClientDelta;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
-public class ODataDeltaRequestImpl extends AbstractODataRetrieveRequest<ODataDelta>
+public class ODataDeltaRequestImpl extends AbstractODataRetrieveRequest<ClientDelta>
implements ODataDeltaRequest {
public ODataDeltaRequestImpl(final ODataClient odataClient, final URI query) {
@@ -46,14 +46,14 @@ public class ODataDeltaRequestImpl extends AbstractODataRetrieveRequest<ODataDel
}
@Override
- public ODataRetrieveResponse<ODataDelta> execute() {
+ public ODataRetrieveResponse<ClientDelta> execute() {
final HttpResponse res = doExecute();
return new ODataDeltaResponseImpl(odataClient, httpClient, res);
}
protected class ODataDeltaResponseImpl extends AbstractODataRetrieveResponse {
- private ODataDelta delta = null;
+ private ClientDelta delta = null;
private ODataDeltaResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
@@ -62,7 +62,7 @@ public class ODataDeltaRequestImpl extends AbstractODataRetrieveRequest<ODataDel
}
@Override
- public ODataDelta getBody() {
+ public ClientDelta getBody() {
if (delta == null) {
try {
final ResWrap<Delta> resource = odataClient.getDeserializer(ODataFormat.fromString(getContentType())).
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 f247ec9..eec258b 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
@@ -27,14 +27,14 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ClientEntity;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
/**
* This class implements an OData retrieve query request returning a single entity.
*/
-public class ODataEntityRequestImpl<E extends ODataEntity>
+public class ODataEntityRequestImpl<E extends ClientEntity>
extends AbstractODataRetrieveRequest<E> implements ODataEntityRequest<E> {
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 737305b..04adfb6 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
@@ -26,14 +26,14 @@ 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;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataEntitySet;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
import org.apache.olingo.commons.api.format.ODataFormat;
/**
* This class implements an OData EntitySet query request.
*/
-public class ODataEntitySetIteratorRequestImpl<ES extends ODataEntitySet, E extends ODataEntity>
+public class ODataEntitySetIteratorRequestImpl<ES extends ClientEntitySet, E extends ClientEntity>
extends AbstractODataRetrieveRequest<ODataEntitySetIterator<ES, E>>
implements ODataEntitySetIteratorRequest<ES, E> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 20d75b7..44de4c1 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
@@ -27,7 +27,7 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataEntitySet;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
@@ -36,7 +36,7 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
*
* @param <ES> concrete ODataEntitySet implementation
*/
-public class ODataEntitySetRequestImpl<ES extends ODataEntitySet>
+public class ODataEntitySetRequestImpl<ES extends ClientEntitySet>
extends AbstractODataRetrieveRequest<ES> implements ODataEntitySetRequest<ES> {
private ES entitySet = null;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 07f753b..91644bf 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
@@ -29,14 +29,14 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse
import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataProperty;
+import org.apache.olingo.commons.api.domain.ClientProperty;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
/**
* This class implements an OData entity property query request.
*/
-public class ODataPropertyRequestImpl<T extends ODataProperty>
+public class ODataPropertyRequestImpl<T extends ClientProperty>
extends AbstractODataRetrieveRequest<T> implements ODataPropertyRequest<T> {
/**
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 ce2f477..771525e 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
@@ -27,14 +27,14 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceD
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.data.ServiceDocument;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataServiceDocument;
+import org.apache.olingo.commons.api.domain.ClientServiceDocument;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
/**
* This class implements an OData service document request.
*/
-public class ODataServiceDocumentRequestImpl extends AbstractODataRetrieveRequest<ODataServiceDocument>
+public class ODataServiceDocumentRequestImpl extends AbstractODataRetrieveRequest<ClientServiceDocument>
implements ODataServiceDocumentRequest {
/**
@@ -53,7 +53,7 @@ public class ODataServiceDocumentRequestImpl extends AbstractODataRetrieveReques
}
@Override
- public ODataRetrieveResponse<ODataServiceDocument> execute() {
+ public ODataRetrieveResponse<ClientServiceDocument> execute() {
final HttpResponse res = doExecute();
return new ODataServiceResponseImpl(odataClient, httpClient, res);
}
@@ -63,7 +63,7 @@ public class ODataServiceDocumentRequestImpl extends AbstractODataRetrieveReques
*/
protected class ODataServiceResponseImpl extends AbstractODataRetrieveResponse {
- private ODataServiceDocument serviceDocument = null;
+ private ClientServiceDocument serviceDocument = null;
private ODataServiceResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
@@ -72,7 +72,7 @@ public class ODataServiceDocumentRequestImpl extends AbstractODataRetrieveReques
}
@Override
- public ODataServiceDocument getBody() {
+ public ClientServiceDocument getBody() {
if (serviceDocument == null) {
try {
final ResWrap<ServiceDocument> resource = odataClient.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 ffb2caf..e6de8a6 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
@@ -27,14 +27,14 @@ 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;
-import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
+import org.apache.olingo.commons.api.domain.ClientPrimitiveValue;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.format.ODataFormat;
/**
* This class implements an OData entity property value query request.
*/
-public class ODataValueRequestImpl extends AbstractODataRetrieveRequest<ODataPrimitiveValue>
+public class ODataValueRequestImpl extends AbstractODataRetrieveRequest<ClientPrimitiveValue>
implements ODataValueRequest {
/**
@@ -53,7 +53,7 @@ public class ODataValueRequestImpl extends AbstractODataRetrieveRequest<ODataPri
}
@Override
- public ODataRetrieveResponse<ODataPrimitiveValue> execute() {
+ public ODataRetrieveResponse<ClientPrimitiveValue> execute() {
final HttpResponse res = doExecute();
return new ODataValueResponseImpl(odataClient, httpClient, res);
}
@@ -63,7 +63,7 @@ public class ODataValueRequestImpl extends AbstractODataRetrieveRequest<ODataPri
*/
protected class ODataValueResponseImpl extends AbstractODataRetrieveResponse {
- private ODataPrimitiveValue value = null;
+ private ClientPrimitiveValue value = null;
private ODataValueResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
final HttpResponse res) {
@@ -72,7 +72,7 @@ public class ODataValueRequestImpl extends AbstractODataRetrieveRequest<ODataPri
}
@Override
- public ODataPrimitiveValue getBody() {
+ public ClientPrimitiveValue getBody() {
if (value == null) {
final ODataFormat format = ODataFormat.fromString(getContentType());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/RetrieveRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/RetrieveRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/RetrieveRequestFactoryImpl.java
index f765875..4717f7a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/RetrieveRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/RetrieveRequestFactoryImpl.java
@@ -35,10 +35,10 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataValueReq
import org.apache.olingo.client.api.communication.request.retrieve.RetrieveRequestFactory;
import org.apache.olingo.client.api.communication.request.retrieve.XMLMetadataRequest;
import org.apache.olingo.client.core.uri.URIUtils;
-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.ODataSingleton;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientSingleton;
public class RetrieveRequestFactoryImpl implements RetrieveRequestFactory {
@@ -93,28 +93,28 @@ public class RetrieveRequestFactoryImpl implements RetrieveRequestFactory {
}
@Override
- public ODataEntitySetRequest<ODataEntitySet> getEntitySetRequest(final URI uri) {
- return new ODataEntitySetRequestImpl<ODataEntitySet>(client, uri);
+ public ODataEntitySetRequest<ClientEntitySet> getEntitySetRequest(final URI uri) {
+ return new ODataEntitySetRequestImpl<ClientEntitySet>(client, uri);
}
@Override
- public ODataEntitySetIteratorRequest<ODataEntitySet, ODataEntity> getEntitySetIteratorRequest(final URI uri) {
- return new ODataEntitySetIteratorRequestImpl<ODataEntitySet, ODataEntity>(client, uri);
+ public ODataEntitySetIteratorRequest<ClientEntitySet, ClientEntity> getEntitySetIteratorRequest(final URI uri) {
+ return new ODataEntitySetIteratorRequestImpl<ClientEntitySet, ClientEntity>(client, uri);
}
@Override
- public ODataEntityRequest<ODataSingleton> getSingletonRequest(final URI uri) {
- return new ODataEntityRequestImpl<ODataSingleton>(client, uri);
+ public ODataEntityRequest<ClientSingleton> getSingletonRequest(final URI uri) {
+ return new ODataEntityRequestImpl<ClientSingleton>(client, uri);
}
@Override
- public ODataEntityRequest<ODataEntity> getEntityRequest(final URI uri) {
- return new ODataEntityRequestImpl<ODataEntity>(client, uri);
+ public ODataEntityRequest<ClientEntity> getEntityRequest(final URI uri) {
+ return new ODataEntityRequestImpl<ClientEntity>(client, uri);
}
@Override
- public ODataPropertyRequest<ODataProperty> getPropertyRequest(final URI uri) {
- return new ODataPropertyRequestImpl<ODataProperty>(client, uri);
+ public ODataPropertyRequest<ClientProperty> getPropertyRequest(final URI uri) {
+ return new ODataPropertyRequestImpl<ClientProperty>(client, uri);
}
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 8f1fede..a6bcb13 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
@@ -32,7 +32,7 @@ import org.apache.olingo.client.core.communication.request.AbstractODataStreamMa
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ClientEntity;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
@@ -41,7 +41,7 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
*
* @param <E> concrete ODataEntity implementation
*/
-public class ODataMediaEntityCreateRequestImpl<E extends ODataEntity>
+public class ODataMediaEntityCreateRequestImpl<E extends ClientEntity>
extends AbstractODataStreamedEntityRequest<ODataMediaEntityCreateResponse<E>, MediaEntityCreateStreamManager<E>>
implements ODataMediaEntityCreateRequest<E> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 5e98d43..d2b287c 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
@@ -32,7 +32,7 @@ import org.apache.olingo.client.core.communication.request.AbstractODataStreamMa
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ClientEntity;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
@@ -41,7 +41,7 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
*
* @param <E> concrete ODataEntity implementation
*/
-public class ODataMediaEntityUpdateRequestImpl<E extends ODataEntity>
+public class ODataMediaEntityUpdateRequestImpl<E extends ClientEntity>
extends AbstractODataStreamedEntityRequest<ODataMediaEntityUpdateResponse<E>, MediaEntityUpdateStreamManager<E>>
implements ODataMediaEntityUpdateRequest<E> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
index a668aaf..916c360 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
@@ -35,7 +35,7 @@ import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ODataError;
+import org.apache.olingo.commons.api.domain.ClientError;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializer;
@@ -86,7 +86,7 @@ public class ClientODataDeserializerImpl implements ClientODataDeserializer {
}
@Override
- public ODataError toError(final InputStream input) throws ODataDeserializerException {
+ public ClientError toError(final InputStream input) throws ODataDeserializerException {
return deserializer.toError(input);
}