olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject [2/3] olingo-odata4 git commit: [OLINGO-575] Merge common with specific api in commons module
Date Mon, 23 Feb 2015 12:59:03 GMT
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataMediaEntityUpdateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataMediaEntityUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataMediaEntityUpdateRequest.java
index 782c606..c998bd7 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataMediaEntityUpdateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataMediaEntityUpdateRequest.java
@@ -20,14 +20,14 @@ package org.apache.olingo.client.api.communication.request.streamed;
 
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 
 /**
  * This class implements an OData Media Entity create request. Get instance by using ODataStreamedRequestFactory.
  *
  * @param <E> concrete ODataEntity implementation
  */
-public interface ODataMediaEntityUpdateRequest<E extends CommonODataEntity>
+public interface ODataMediaEntityUpdateRequest<E extends ODataEntity>
         extends ODataStreamedEntityRequest<ODataMediaEntityUpdateResponse<E>, MediaEntityUpdateStreamManager<E>>,
         ODataBatchableRequest {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java
index 542538e..c90a25c 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java
@@ -18,7 +18,7 @@
  */
 package org.apache.olingo.client.api.communication.response;
 
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 
 /**
  * This interface describes the response to an OData entity create request.
@@ -26,7 +26,7 @@ import org.apache.olingo.commons.api.domain.CommonODataEntity;
  * @param <E> concrete ODataEntity implementation
  * @see org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest
  */
-public interface ODataEntityCreateResponse<E extends CommonODataEntity> extends ODataResponse {
+public interface ODataEntityCreateResponse<E extends ODataEntity> extends ODataResponse {
 
   /**
    * Gets created object.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java
index 3063153..2f999bc 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java
@@ -18,7 +18,7 @@
  */
 package org.apache.olingo.client.api.communication.response;
 
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 
 /**
  * This class implements the response to an OData update request.
@@ -26,7 +26,7 @@ import org.apache.olingo.commons.api.domain.CommonODataEntity;
  * @param <E> concrete ODataEntity implementation
  * @see org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest
  */
-public interface ODataEntityUpdateResponse<E extends CommonODataEntity> extends ODataResponse {
+public interface ODataEntityUpdateResponse<E extends ODataEntity> extends ODataResponse {
 
   /**
    * Gets updated object.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java
index 4a757c1..fde5192 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java
@@ -18,14 +18,14 @@
  */
 package org.apache.olingo.client.api.communication.response;
 
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 
 /**
  * This class implements the response to an OData media entity create request.
  *
  * @param <E> concrete ODataEntity implementation
  */
-public interface ODataMediaEntityCreateResponse<E extends CommonODataEntity> extends ODataResponse {
+public interface ODataMediaEntityCreateResponse<E extends ODataEntity> extends ODataResponse {
 
   /**
    * Gets created object.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java
index e5b7f7b..b267507 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java
@@ -18,14 +18,14 @@
  */
 package org.apache.olingo.client.api.communication.response;
 
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 
 /**
  * This class implements the response to an Odata media entity update request.
  *
  * @param <E> concrete ODataEntity implementation
  */
-public interface ODataMediaEntityUpdateResponse<E extends CommonODataEntity> extends ODataResponse {
+public interface ODataMediaEntityUpdateResponse<E extends ODataEntity> extends ODataResponse {
 
   /**
    * Gets updated object.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 c30d0c7..ca2ad51 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.CommonODataProperty;
+import org.apache.olingo.commons.api.domain.ODataProperty;
 
 /**
  * This class implements the response to an OData update entity property request.
@@ -32,5 +32,5 @@ public interface ODataPropertyUpdateResponse extends ODataResponse {
    *
    * @return updated object.
    */
-  CommonODataProperty getBody();
+  ODataProperty getBody();
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 05f3338..da0eb2f 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.CommonODataClient;
 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.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
+import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntitySet;
 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 CommonODataEntitySet, E extends CommonODataEntity>
+public class ODataEntitySetIterator<ES extends ODataEntitySet, E extends ODataEntity>
         implements Iterator<E> {
 
   /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataBinder.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataBinder.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataBinder.java
index 0fd4fe8..d0c7814 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataBinder.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataBinder.java
@@ -24,9 +24,9 @@ import org.apache.olingo.commons.api.data.EntitySet;
 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.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+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.ODataLink;
 import org.apache.olingo.commons.api.domain.ODataServiceDocument;
 
@@ -38,7 +38,7 @@ public interface CommonODataBinder {
    * @param entitySet OData entity set.
    * @return {@link EntitySet} object.
    */
-  EntitySet getEntitySet(CommonODataEntitySet entitySet);
+  EntitySet getEntitySet(ODataEntitySet entitySet);
 
   /**
    * Gets an <tt>Entity</tt> from the given OData entity.
@@ -46,7 +46,7 @@ public interface CommonODataBinder {
    * @param entity OData entity.
    * @return {@link Entity} object.
    */
-  Entity getEntity(CommonODataEntity entity);
+  Entity getEntity(ODataEntity entity);
 
   /**
    * Gets a <tt>Link</tt> from the given OData link.
@@ -62,7 +62,7 @@ public interface CommonODataBinder {
    * @param property OData property.
    * @return <tt>Property</tt> object.
    */
-  Property getProperty(CommonODataProperty property);
+  Property getProperty(ODataProperty property);
 
   /**
    * Adds the given property to the given entity.
@@ -71,7 +71,7 @@ public interface CommonODataBinder {
    * @param property OData property.
    * @return whether add was successful or not.
    */
-  boolean add(CommonODataEntity entity, CommonODataProperty property);
+  boolean add(ODataEntity entity, ODataProperty property);
 
   /**
    * Gets <tt>ODataServiceDocument</tt> from the given service document resource.
@@ -85,23 +85,23 @@ public interface CommonODataBinder {
    * Gets <tt>ODataEntitySet</tt> from the given entity set resource.
    *
    * @param resource entity set resource.
-   * @return {@link CommonODataEntitySet} object.
+   * @return {@link org.apache.olingo.commons.api.domain.ODataEntitySet} object.
    */
-  CommonODataEntitySet getODataEntitySet(ResWrap<EntitySet> resource);
+  ODataEntitySet getODataEntitySet(ResWrap<EntitySet> resource);
 
   /**
    * Gets <tt>ODataEntity</tt> from the given entity resource.
    *
    * @param resource entity resource.
-   * @return {@link CommonODataEntity} object.
+   * @return {@link org.apache.olingo.commons.api.domain.ODataEntity} object.
    */
-  CommonODataEntity getODataEntity(ResWrap<Entity> resource);
+  ODataEntity getODataEntity(ResWrap<Entity> resource);
 
   /**
    * Gets an <tt>ODataProperty</tt> from the given property resource.
    *
    * @param resource property resource.
-   * @return {@link CommonODataProperty} object.
+   * @return {@link org.apache.olingo.commons.api.domain.ODataProperty} object.
    */
-  CommonODataProperty getODataProperty(ResWrap<Property> resource);
+  ODataProperty getODataProperty(ResWrap<Property> resource);
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java
index c678d2b..7ad713d 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java
@@ -23,9 +23,9 @@ import java.util.Map;
 
 import org.apache.olingo.client.api.edm.xml.Schema;
 import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+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.ODataError;
 import org.apache.olingo.commons.api.domain.ODataServiceDocument;
 import org.apache.olingo.commons.api.edm.Edm;
@@ -76,7 +76,7 @@ public interface CommonODataReader {
    * @return de-serialized entity set.
    * @throws ODataDeserializerException
    */
-  CommonODataEntitySet readEntitySet(InputStream input, ODataFormat format) throws ODataDeserializerException;
+  ODataEntitySet readEntitySet(InputStream input, ODataFormat format) throws ODataDeserializerException;
 
   /**
    * Parses a stream taking care to de-serializes the first OData entity found.
@@ -86,7 +86,7 @@ public interface CommonODataReader {
    * @return entity de-serialized.
    * @throws ODataDeserializerException
    */
-  CommonODataEntity readEntity(InputStream input, ODataFormat format) throws ODataDeserializerException;
+  ODataEntity readEntity(InputStream input, ODataFormat format) throws ODataDeserializerException;
 
   /**
    * Parses a stream taking care to de-serialize the first OData entity property found.
@@ -96,7 +96,7 @@ public interface CommonODataReader {
    * @return OData entity property de-serialized.
    * @throws ODataDeserializerException
    */
-  CommonODataProperty readProperty(InputStream input, ODataFormat format) throws ODataDeserializerException;
+  ODataProperty readProperty(InputStream input, ODataFormat format) throws ODataDeserializerException;
 
   /**
    * Parses a stream into an OData error.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 0e92989..1686997 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,8 +23,8 @@ import java.net.URI;
 import java.util.Collection;
 
 import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+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.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<CommonODataEntity> entities, ODataFormat format)
+  InputStream writeEntities(Collection<ODataEntity> entities, ODataFormat format)
       throws ODataSerializerException;
 
   /**
@@ -57,7 +57,7 @@ public interface ODataWriter {
    * @return stream of serialized object.
    * @throws ODataSerializerException
    */
-  InputStream writeEntity(CommonODataEntity entity, ODataFormat format)
+  InputStream writeEntity(ODataEntity entity, ODataFormat format)
       throws ODataSerializerException;
 
   /**
@@ -68,7 +68,7 @@ public interface ODataWriter {
    * @return stream of serialized object.
    * @throws ODataSerializerException
    */
-  InputStream writeProperty(CommonODataProperty property, ODataFormat format)
+  InputStream writeProperty(ODataProperty property, ODataFormat format)
       throws ODataSerializerException;
 
   /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java
index 6b434d3..d73162f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java
@@ -36,8 +36,8 @@ import org.apache.olingo.client.core.communication.request.streamed.ODataMediaEn
 import org.apache.olingo.client.core.communication.request.streamed.ODataMediaEntityUpdateRequestImpl;
 import org.apache.olingo.client.core.communication.request.streamed.ODataStreamUpdateRequestImpl;
 import org.apache.olingo.client.core.uri.URIUtils;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ODataProperty;
 import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
 import org.apache.olingo.commons.api.http.HttpMethod;
 
@@ -50,14 +50,14 @@ public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> imp
   }
 
   @Override
-  public <E extends CommonODataEntity> ODataEntityCreateRequest<E> getEntityCreateRequest(
+  public <E extends ODataEntity> ODataEntityCreateRequest<E> getEntityCreateRequest(
           final URI targetURI, final E entity) {
 
     return new ODataEntityCreateRequestImpl<E>(client, targetURI, entity);
   }
 
   @Override
-  public <E extends CommonODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
+  public <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
           final URI targetURI, final UT type, final E changes) {
 
     final ODataEntityUpdateRequest<E> req;
@@ -73,7 +73,7 @@ public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> imp
   }
 
   @Override
-  public <E extends CommonODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
+  public <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(
           final UT type, final E entity) {
 
     if (entity.getEditLink() == null) {
@@ -110,7 +110,7 @@ public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> imp
 
   @Override
   public ODataPropertyUpdateRequest getPropertyPrimitiveValueUpdateRequest(
-          final URI targetURI, final CommonODataProperty property) {
+          final URI targetURI, final ODataProperty property) {
 
     if (!property.hasPrimitiveValue()) {
       throw new IllegalArgumentException("A primitive value is required");
@@ -130,7 +130,7 @@ public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> imp
 
   @Override
   public ODataPropertyUpdateRequest getPropertyComplexValueUpdateRequest(
-          final URI targetURI, final UT type, final CommonODataProperty property) {
+          final URI targetURI, final UT type, final ODataProperty property) {
 
     if (!property.hasComplexValue()) {
       throw new IllegalArgumentException("A complex value is required");
@@ -150,7 +150,7 @@ public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> imp
 
   @Override
   public ODataPropertyUpdateRequest getPropertyCollectionValueUpdateRequest(
-          final URI targetURI, final CommonODataProperty property) {
+          final URI targetURI, final ODataProperty property) {
 
     if (!property.hasCollectionValue()) {
       throw new IllegalArgumentException("A collection value is required");
@@ -183,7 +183,7 @@ public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> imp
   }
 
   @Override
-  public <E extends CommonODataEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest(
+  public <E extends ODataEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest(
           final URI targetURI, final InputStream media) {
 
     return new ODataMediaEntityCreateRequestImpl<E>(client, targetURI, media);
@@ -204,7 +204,7 @@ public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> imp
   }
 
   @Override
-  public <E extends CommonODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest(
+  public <E extends ODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest(
           final URI editURI, final InputStream media) {
 
     final ODataMediaEntityUpdateRequest<E> req;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 29313fd..4e261a3 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.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 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 CommonODataEntity>
+public class ODataEntityCreateRequestImpl<E extends ODataEntity>
         extends AbstractODataBasicRequest<ODataEntityCreateResponse<E>>
         implements ODataEntityCreateRequest<E> {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 5de3c1c..8c52faf 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.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 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 CommonODataEntity>
+public class ODataEntityUpdateRequestImpl<E extends ODataEntity>
         extends AbstractODataBasicRequest<ODataEntityUpdateResponse<E>>
         implements ODataEntityUpdateRequest<E> {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 4bbf1d0..d1ee5af 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.CommonODataProperty;
+import org.apache.olingo.commons.api.domain.ODataProperty;
 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 CommonODataProperty property;
+  private final ODataProperty property;
 
   /**
    * Constructor.
@@ -59,7 +59,7 @@ public class ODataPropertyUpdateRequestImpl extends AbstractODataBasicRequest<OD
    * @param property value to be created.
    */
   ODataPropertyUpdateRequestImpl(final CommonODataClient<?> odataClient,
-          final HttpMethod method, final URI targetURI, final CommonODataProperty property) {
+          final HttpMethod method, final URI targetURI, final ODataProperty 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 CommonODataProperty property = null;
+    private ODataProperty property = null;
 
     private ODataPropertyUpdateResponseImpl(final CommonODataClient<?> odataClient, final HttpClient httpClient,
             final HttpResponse res) {
@@ -106,7 +106,7 @@ public class ODataPropertyUpdateRequestImpl extends AbstractODataBasicRequest<OD
     }
 
     @Override
-    public CommonODataProperty getBody() {
+    public ODataProperty getBody() {
       if (property == null) {
         try {
           final ResWrap<Property> resource = odataClient.getDeserializer(ODataFormat.fromString(getAccept())).

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 10af5af..fdd0f27 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
@@ -24,9 +24,9 @@ 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.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+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.commons.api.edm.EdmReturnType;
@@ -71,11 +71,11 @@ public abstract class AbstractInvokeRequestFactory implements InvokeRequestFacto
       result = (Class<RES>) ODataNoContent.class;
     } else {
       if (returnType.isCollection() && returnType.getType().getKind() == EdmTypeKind.ENTITY) {
-        result = (Class<RES>) CommonODataEntitySet.class;
+        result = (Class<RES>) ODataEntitySet.class;
       } else if (!returnType.isCollection() && returnType.getType().getKind() == EdmTypeKind.ENTITY) {
-        result = (Class<RES>) CommonODataEntity.class;
+        result = (Class<RES>) ODataEntity.class;
       } else {
-        result = (Class<RES>) CommonODataProperty.class;
+        result = (Class<RES>) ODataProperty.class;
       }
     }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 a3f35eb..d813ba9 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
@@ -39,9 +39,9 @@ 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.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+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.commons.api.format.ODataFormat;
@@ -97,7 +97,7 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
   }
 
   private String getActualFormat(final ODataFormat format) {
-    return ((CommonODataProperty.class.isAssignableFrom(reference) && format == ODataFormat.ATOM)
+    return ((ODataProperty.class.isAssignableFrom(reference) && format == ODataFormat.ATOM)
             ? ODataFormat.XML : format)
             .getContentType(odataClient.getServiceVersion()).toContentTypeString();
   }
@@ -115,9 +115,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 CommonODataEntity tmp = odataClient.getObjectFactory().newEntity(null);
+      final ODataEntity tmp = odataClient.getObjectFactory().newEntity(null);
       for (Map.Entry<String, ODataValue> param : parameters.entrySet()) {
-        CommonODataProperty property = null;
+        ODataProperty property = null;
 
         if (param.getValue().isPrimitive()) {
           property = odataClient.getObjectFactory().
@@ -201,13 +201,13 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult>
           } else {
             // avoid getContent() twice:IllegalStateException: Content has been consumed
             final InputStream responseStream = this.payload == null ? res.getEntity().getContent() : this.payload;
-            if (CommonODataEntitySet.class.isAssignableFrom(reference)) {
+            if (ODataEntitySet.class.isAssignableFrom(reference)) {
               invokeResult = reference.cast(odataClient.getReader().readEntitySet(responseStream,
                       ODataFormat.fromString(getContentType())));
-            } else if (CommonODataEntity.class.isAssignableFrom(reference)) {
+            } else if (ODataEntity.class.isAssignableFrom(reference)) {
               invokeResult = reference.cast(odataClient.getReader().readEntity(responseStream,
                       ODataFormat.fromString(getContentType())));
-            } else if (CommonODataProperty.class.isAssignableFrom(reference)) {
+            } else if (ODataProperty.class.isAssignableFrom(reference)) {
               invokeResult = reference.cast(odataClient.getReader().readProperty(responseStream,
                       ODataFormat.fromString(getContentType())));
             }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 1b85266..f867bc6 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.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 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 CommonODataEntity>
+public class ODataEntityRequestImpl<E extends ODataEntity>
         extends AbstractODataRetrieveRequest<E> implements ODataEntityRequest<E> {
 
   /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 de4c11d..8b99b44 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.CommonODataClient;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.client.api.domain.ODataEntitySetIterator;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
+import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntitySet;
 import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * This class implements an OData EntitySet query request.
  */
-public class ODataEntitySetIteratorRequestImpl<ES extends CommonODataEntitySet, E extends CommonODataEntity>
+public class ODataEntitySetIteratorRequestImpl<ES extends ODataEntitySet, E extends ODataEntity>
         extends AbstractODataRetrieveRequest<ODataEntitySetIterator<ES, E>>
         implements ODataEntitySetIteratorRequest<ES, E> {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 f39d113..0214dec 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.EntitySet;
 import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
+import org.apache.olingo.commons.api.domain.ODataEntitySet;
 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 CommonODataEntitySet>
+public class ODataEntitySetRequestImpl<ES extends ODataEntitySet>
         extends AbstractODataRetrieveRequest<ES> implements ODataEntitySetRequest<ES> {
 
   private ES entitySet = null;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 25a9ca6..e8c6797 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.CommonODataProperty;
+import org.apache.olingo.commons.api.domain.ODataProperty;
 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 CommonODataProperty>
+public class ODataPropertyRequestImpl<T extends ODataProperty>
         extends AbstractODataRetrieveRequest<T> implements ODataPropertyRequest<T> {
 
   /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 ee17575..3ef64c2 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.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 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 CommonODataEntity>
+public class ODataMediaEntityCreateRequestImpl<E extends ODataEntity>
         extends AbstractODataStreamedEntityRequest<ODataMediaEntityCreateResponse<E>, MediaEntityCreateStreamManager<E>>
         implements ODataMediaEntityCreateRequest<E> {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 cf58a01..aa79b36 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.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 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 CommonODataEntity>
+public class ODataMediaEntityUpdateRequestImpl<E extends ODataEntity>
         extends AbstractODataStreamedEntityRequest<ODataMediaEntityUpdateResponse<E>, MediaEntityUpdateStreamManager<E>>
         implements ODataMediaEntityUpdateRequest<E> {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataBinder.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataBinder.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataBinder.java
index 7a93bbe..3a0024e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataBinder.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataBinder.java
@@ -42,9 +42,9 @@ import org.apache.olingo.commons.api.data.LinkedComplexValue;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.data.Valuable;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+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.ODataCollectionValue;
 import org.apache.olingo.commons.api.domain.ODataComplexValue;
 import org.apache.olingo.commons.api.domain.ODataInlineEntity;
@@ -108,7 +108,7 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
   }
 
   @Override
-  public EntitySet getEntitySet(final CommonODataEntitySet odataEntitySet) {
+  public EntitySet getEntitySet(final ODataEntitySet odataEntitySet) {
     final EntitySet entitySet = new EntitySetImpl();
 
     entitySet.setCount(odataEntitySet.getCount());
@@ -118,7 +118,7 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
       entitySet.setNext(next);
     }
 
-    for (CommonODataEntity entity : odataEntitySet.getEntities()) {
+    for (ODataEntity entity : odataEntitySet.getEntities()) {
       entitySet.getEntities().add(getEntity(entity));
     }
 
@@ -148,7 +148,7 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
   }
 
   @Override
-  public Entity getEntity(final CommonODataEntity odataEntity) {
+  public Entity getEntity(final ODataEntity odataEntity) {
     final Entity entity = new EntityImpl();
 
     entity.setType(odataEntity.getTypeName() == null ? null : odataEntity.getTypeName().toString());
@@ -191,7 +191,7 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
       entity.setMediaETag(odataEntity.getMediaETag());
     }
 
-    for (CommonODataProperty property : odataEntity.getProperties()) {
+    for (ODataProperty property : odataEntity.getProperties()) {
       entity.getProperties().add(getProperty(property));
     }
 
@@ -209,13 +209,13 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
 
     if (link instanceof ODataInlineEntity) {
       // append inline entity
-      final CommonODataEntity inlineEntity = ((ODataInlineEntity) link).getEntity();
+      final ODataEntity inlineEntity = ((ODataInlineEntity) link).getEntity();
       LOG.debug("Append in-line entity\n{}", inlineEntity);
 
       linkResource.setInlineEntity(getEntity(inlineEntity));
     } else if (link instanceof ODataInlineEntitySet) {
       // append inline entity set
-      final CommonODataEntitySet InlineEntitySet = ((ODataInlineEntitySet) link).getEntitySet();
+      final ODataEntitySet InlineEntitySet = ((ODataInlineEntitySet) link).getEntitySet();
       LOG.debug("Append in-line entity set\n{}", InlineEntitySet);
 
       linkResource.setInlineEntitySet(getEntitySet(InlineEntitySet));
@@ -230,10 +230,10 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
     } else if (value.isPrimitive()) {
       return value.asPrimitive().toValue();
     } else if (value.isComplex()) {
-      final ODataComplexValue<? extends CommonODataProperty> _value = value.asComplex();
+      final ODataComplexValue<? extends ODataProperty> _value = value.asComplex();
       List<Property> valueResource = new ArrayList<Property>();
 
-      for (final CommonODataProperty propertyValue : _value) {
+      for (final ODataProperty propertyValue : _value) {
         valueResource.add(getProperty(propertyValue));
       }
       return valueResource;
@@ -249,10 +249,10 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
     return null;
   }
 
-  protected abstract boolean add(CommonODataEntitySet entitySet, CommonODataEntity entity);
+  protected abstract boolean add(ODataEntitySet entitySet, ODataEntity entity);
 
   @Override
-  public CommonODataEntitySet getODataEntitySet(final ResWrap<EntitySet> resource) {
+  public ODataEntitySet getODataEntitySet(final ResWrap<EntitySet> resource) {
     if (LOG.isDebugEnabled()) {
       final StringWriter writer = new StringWriter();
       try {
@@ -269,7 +269,7 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
 
     final URI next = resource.getPayload().getNext();
 
-    final CommonODataEntitySet entitySet = next == null
+    final ODataEntitySet entitySet = next == null
             ? client.getObjectFactory().newEntitySet()
             : client.getObjectFactory().newEntitySet(URIUtils.getURI(base, next.toASCIIString()));
 
@@ -420,7 +420,7 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
   }
 
   @Override
-  public CommonODataEntity getODataEntity(final ResWrap<Entity> resource) {
+  public ODataEntity getODataEntity(final ResWrap<Entity> resource) {
     if (LOG.isDebugEnabled()) {
       final StringWriter writer = new StringWriter();
       try {
@@ -445,7 +445,7 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
       typeName = new FullQualifiedName(resource.getPayload().getType());
     }
 
-    final CommonODataEntity entity = resource.getPayload().getSelfLink() == null
+    final ODataEntity entity = resource.getPayload().getSelfLink() == null
             ? client.getObjectFactory().newEntity(typeName)
             : client.getObjectFactory().newEntity(typeName,
                     URIUtils.getURI(base, resource.getPayload().getSelfLink().getHref()));
@@ -556,7 +556,7 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
     return typeInfo;
   }
 
-  protected abstract CommonODataProperty getODataProperty(EdmType type, Property resource);
+  protected abstract ODataProperty getODataProperty(EdmType type, Property resource);
 
   protected ODataValue getODataValue(final FullQualifiedName type,
           final Valuable valuable, final URI contextURL, final String metadataETag) {
@@ -599,8 +599,8 @@ public abstract class AbstractODataBinder implements CommonODataBinder {
               build();
     } else if (valuable.isComplex()) {
       @SuppressWarnings("unchecked")
-      final ODataComplexValue<CommonODataProperty> cValue =
-              (ODataComplexValue<CommonODataProperty>) client.getObjectFactory().
+      final ODataComplexValue<ODataProperty> cValue =
+              (ODataComplexValue<ODataProperty>) client.getObjectFactory().
               newComplexValue(type == null ? null : type.toString());
 
       if (!valuable.isNull()) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataReader.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataReader.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataReader.java
index 5a32d70..876581d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataReader.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataReader.java
@@ -34,9 +34,9 @@ import org.apache.olingo.commons.api.data.Entity;
 import org.apache.olingo.commons.api.data.EntitySet;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+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.ODataError;
 import org.apache.olingo.commons.api.domain.ODataServiceDocument;
 import org.apache.olingo.commons.api.domain.ODataValue;
@@ -93,22 +93,22 @@ public abstract class AbstractODataReader implements CommonODataReader {
         res = new ResWrap<T>(
                 (URI) null,
                 null,
-                reference.cast(new ODataEntitySetIterator<CommonODataEntitySet, CommonODataEntity>(
+                reference.cast(new ODataEntitySetIterator<ODataEntitySet, ODataEntity>(
                                 client, src, ODataFormat.fromString(format))));
-      } else if (CommonODataEntitySet.class.isAssignableFrom(reference)) {
+      } else if (ODataEntitySet.class.isAssignableFrom(reference)) {
         final ResWrap<EntitySet> resource = client.getDeserializer(ODataFormat.fromString(format))
             .toEntitySet(src);
         res = new ResWrap<T>(
                 resource.getContextURL(),
                 resource.getMetadataETag(),
                 reference.cast(client.getBinder().getODataEntitySet(resource)));
-      } else if (CommonODataEntity.class.isAssignableFrom(reference)) {
+      } else if (ODataEntity.class.isAssignableFrom(reference)) {
         final ResWrap<Entity> container = client.getDeserializer(ODataFormat.fromString(format)).toEntity(src);
         res = new ResWrap<T>(
                 container.getContextURL(),
                 container.getMetadataETag(),
                 reference.cast(client.getBinder().getODataEntity(container)));
-      } else if (CommonODataProperty.class.isAssignableFrom(reference)) {
+      } else if (ODataProperty.class.isAssignableFrom(reference)) {
         final ResWrap<Property> container = client.getDeserializer(ODataFormat.fromString(format)).toProperty(src);
         res = new ResWrap<T>(
                 container.getContextURL(),

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
index 86d1847..e291782 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
@@ -41,22 +41,19 @@ import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.data.Valuable;
 import org.apache.olingo.commons.api.data.ValueType;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+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.ODataAnnotatable;
 import org.apache.olingo.commons.api.domain.ODataAnnotation;
 import org.apache.olingo.commons.api.domain.ODataCollectionValue;
 import org.apache.olingo.commons.api.domain.ODataDelta;
 import org.apache.olingo.commons.api.domain.ODataDeltaLink;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataEntitySet;
 import org.apache.olingo.commons.api.domain.ODataInlineEntity;
 import org.apache.olingo.commons.api.domain.ODataInlineEntitySet;
 import org.apache.olingo.commons.api.domain.ODataLink;
 import org.apache.olingo.commons.api.domain.ODataLinked;
 import org.apache.olingo.commons.api.domain.ODataLinkedComplexValue;
-import org.apache.olingo.commons.api.domain.ODataProperty;
 import org.apache.olingo.commons.api.domain.ODataServiceDocument;
 import org.apache.olingo.commons.api.domain.ODataValuable;
 import org.apache.olingo.commons.api.domain.ODataValue;
@@ -85,12 +82,12 @@ public class ODataBinderImpl extends AbstractODataBinder implements ODataBinder
   }
 
   @Override
-  public boolean add(final CommonODataEntity entity, final CommonODataProperty property) {
+  public boolean add(final ODataEntity entity, final ODataProperty property) {
     return ((ODataEntity) entity).getProperties().add((ODataProperty) property);
   }
 
   @Override
-  protected boolean add(final CommonODataEntitySet entitySet, final CommonODataEntity entity) {
+  protected boolean add(final ODataEntitySet entitySet, final ODataEntity entity) {
     return ((ODataEntitySet) entitySet).getEntities().add((ODataEntity) entity);
   }
 
@@ -168,7 +165,7 @@ public class ODataBinderImpl extends AbstractODataBinder implements ODataBinder
   }
 
   @Override
-  public EntitySet getEntitySet(final CommonODataEntitySet odataEntitySet) {
+  public EntitySet getEntitySet(final ODataEntitySet odataEntitySet) {
     final EntitySet entitySet = super.getEntitySet(odataEntitySet);
     entitySet.setDeltaLink(((ODataEntitySet) odataEntitySet).getDeltaLink());
     annotations((ODataEntitySet) odataEntitySet, entitySet);
@@ -188,7 +185,7 @@ public class ODataBinderImpl extends AbstractODataBinder implements ODataBinder
   }
 
   @Override
-  public Entity getEntity(final CommonODataEntity odataEntity) {
+  public Entity getEntity(final ODataEntity odataEntity) {
     final Entity entity = super.getEntity(odataEntity);
     entity.setId(((ODataEntity) odataEntity).getId());
     annotations((ODataEntity) odataEntity, entity);
@@ -196,7 +193,7 @@ public class ODataBinderImpl extends AbstractODataBinder implements ODataBinder
   }
 
   @Override
-  public Property getProperty(final CommonODataProperty property) {
+  public Property getProperty(final ODataProperty property) {
     final ODataProperty _property = (ODataProperty) property;
 
     final Property propertyResource = new PropertyImpl();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/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 9bc5f34..4a8827d 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
@@ -32,8 +32,8 @@ import org.apache.olingo.client.api.CommonODataClient;
 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.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+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.format.ODataFormat;
 import org.apache.olingo.commons.api.serialization.ODataSerializerException;
@@ -47,7 +47,7 @@ public class ODataWriterImpl implements ODataWriter {
   }
 
   @Override
-  public InputStream writeEntities(final Collection<CommonODataEntity> entities, final ODataFormat format)
+  public InputStream writeEntities(final Collection<ODataEntity> entities, final ODataFormat format)
       throws ODataSerializerException {
     ByteArrayOutputStream output = new ByteArrayOutputStream();
     OutputStreamWriter writer;
@@ -57,7 +57,7 @@ public class ODataWriterImpl implements ODataWriter {
       writer = null;
     }
     try {
-      for (CommonODataEntity entity : entities) {
+      for (ODataEntity entity : entities) {
         client.getSerializer(format).write(writer, client.getBinder().getEntity(entity));
       }
 
@@ -68,13 +68,13 @@ public class ODataWriterImpl implements ODataWriter {
   }
 
   @Override
-  public InputStream writeEntity(final CommonODataEntity entity, final ODataFormat format)
+  public InputStream writeEntity(final ODataEntity entity, final ODataFormat format)
       throws ODataSerializerException {
-    return writeEntities(Collections.<CommonODataEntity>singleton(entity), format);
+    return writeEntities(Collections.<ODataEntity>singleton(entity), format);
   }
 
   @Override
-  public InputStream writeProperty(final CommonODataProperty property, final ODataFormat format)
+  public InputStream writeProperty(final ODataProperty property, final ODataFormat format)
       throws ODataSerializerException {
     final ByteArrayOutputStream output = new ByteArrayOutputStream();
     OutputStreamWriter writer;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java
index 58dca28..4f2470d 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java
@@ -79,7 +79,7 @@ public abstract class AbstractODataValue implements ODataValue {
    */
   @SuppressWarnings("unchecked")
   @Override
-  public <OP extends CommonODataProperty> ODataComplexValue<OP> asComplex() {
+  public <OP extends ODataProperty> ODataComplexValue<OP> asComplex() {
     return isComplex() ? (ODataComplexValue<OP>) this : null;
   }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataEntity.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataEntity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataEntity.java
deleted file mode 100644
index e5d325b..0000000
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataEntity.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.commons.api.domain;
-
-import org.apache.olingo.commons.api.edm.FullQualifiedName;
-
-import java.net.URI;
-import java.util.List;
-
-/**
- * OData entity.
- */
-public interface CommonODataEntity extends ODataLinked, ODataInvokeResult {
-
-  /**
-   * @return the type name of this entity.
-   */
-  FullQualifiedName getTypeName();
-
-  /**
-   * @return self link.
-   */
-  URI getLink();
-
-  /**
-   * Returns OData entity edit link.
-   * 
-   * @return entity edit link.
-   */
-  URI getEditLink();
-
-  /**
-   * Sets OData entity edit link.
-   * 
-   * @param editLink edit link.
-   */
-  void setEditLink(URI editLink);
-
-  /**
-   * Gets ETag.
-   * 
-   * @return ETag.
-   */
-  String getETag();
-
-  /**
-   * Sets ETag.
-   * 
-   * @param eTag ETag.
-   */
-  void setETag(String eTag);
-
-  /**
-   * Searches for operation with given title.
-   * 
-   * @param title operation to look for
-   * @return operation if found with given title, <tt>null</tt> otherwise
-   */
-  ODataOperation getOperation(String title);
-
-  /**
-   * Gets operations.
-   * 
-   * @return operations.
-   */
-  List<ODataOperation> getOperations();
-
-  /**
-   * Searches for property with given name.
-   * 
-   * @param name property to look for
-   * @return property if found with given name, <tt>null</tt> otherwise
-   */
-  CommonODataProperty getProperty(String name);
-
-  /**
-   * Returns OData entity properties.
-   * 
-   * @return OData entity properties.
-   */
-  List<? extends CommonODataProperty> getProperties();
-
-  /**
-   * Gets media-edit link with given name, if available, otherwise <tt>null</tt>.
-   * 
-   * @param name candidate link name
-   * @return media-edit link with given name, if available, otherwise <tt>null</tt>
-   */
-  ODataLink getMediaEditLink(final String name);
-
-  /**
-   * Returns entity media edit links.
-   * 
-   * @return OData entity links.
-   */
-  List<ODataLink> getMediaEditLinks();
-
-  /**
-   * TRUE if read-only entity.
-   * 
-   * @return TRUE if read-only; FALSE otherwise.
-   */
-  boolean isReadOnly();
-
-  /**
-   * Checks if the current entity is a media entity.
-   * 
-   * @return 'TRUE' if media entity; 'FALSE' otherwise.
-   */
-  boolean isMediaEntity();
-
-  /**
-   * Sets media entity flag.
-   * 
-   * @param isMediaEntity media entity flag value.
-   */
-  void setMediaEntity(boolean isMediaEntity);
-
-  /**
-   * Gets media content type.
-   * 
-   * @return media content type.
-   */
-  String getMediaContentType();
-
-  /**
-   * Sets media content type.
-   * 
-   * @param mediaContentType media content type.
-   */
-  void setMediaContentType(String mediaContentType);
-
-  /**
-   * Gets media content source.
-   * 
-   * @return media content source.
-   */
-  URI getMediaContentSource();
-
-  /**
-   * Sets media content source.
-   * 
-   * @param mediaContentSource media content source.
-   */
-  void setMediaContentSource(URI mediaContentSource);
-
-  /**
-   * ETag of the binary stream represented by this media entity or named stream property.
-   * 
-   * @return media ETag value
-   */
-  String getMediaETag();
-
-  /**
-   * Set media ETag.
-   * 
-   * @param eTag media ETag value
-   */
-  void setMediaETag(String eTag);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataEntitySet.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataEntitySet.java
deleted file mode 100644
index b2d76fb..0000000
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataEntitySet.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.commons.api.domain;
-
-import java.net.URI;
-import java.util.List;
-
-/**
- * OData entity collection. If pagination was used to get this instance, forward page navigation URI will be available.
- */
-public interface CommonODataEntitySet extends ODataInvokeResult {
-
-  /**
-   * Gets next page link.
-   * 
-   * @return next page link; null value if single page or last page reached.
-   */
-  URI getNext();
-
-  /**
-   * Gets contained entities.
-   * 
-   * @return entity set's entities.
-   */
-  List<? extends CommonODataEntity> getEntities();
-
-  /**
-   * Gets in-line count.
-   * 
-   * @return in-line count value.
-   */
-  Integer getCount();
-
-  /**
-   * Sets in-line count.
-   * 
-   * @param count in-line count value.
-   */
-  void setCount(final int count);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataObjectFactory.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataObjectFactory.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataObjectFactory.java
deleted file mode 100644
index cae0c18..0000000
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataObjectFactory.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.commons.api.domain;
-
-import org.apache.olingo.commons.api.edm.FullQualifiedName;
-
-import java.net.URI;
-
-/**
- * Entry point for generating OData domain objects.
- */
-public interface CommonODataObjectFactory {
-
-  /**
-   * Instantiates a new entity set.
-   * 
-   * @return entity set.
-   */
-  CommonODataEntitySet newEntitySet();
-
-  /**
-   * Instantiates a new entity set.
-   * 
-   * @param next next link.
-   * @return entity set.
-   */
-  CommonODataEntitySet newEntitySet(URI next);
-
-  /**
-   * Instantiates a new entity.
-   * 
-   * @param typeName OData entity type name.
-   * @return entity.
-   */
-  CommonODataEntity newEntity(FullQualifiedName typeName);
-
-  /**
-   * Instantiates a new entity.
-   * 
-   * @param typeName OData entity type name.
-   * @param link self link.
-   * @return entity.
-   */
-  CommonODataEntity newEntity(FullQualifiedName typeName, URI link);
-
-  /**
-   * Instantiates a new entity set (for deep insert).
-   * 
-   * @param name name.
-   * @param entitySet entity set.
-   * @return in-line entity set.
-   */
-  ODataInlineEntitySet newDeepInsertEntitySet(String name, CommonODataEntitySet entitySet);
-
-  /**
-   * Instantiates a new entity (for deep insert).
-   * 
-   * @param name name.
-   * @param entity entity.
-   * @return in-line entity.
-   */
-  ODataInlineEntity newDeepInsertEntity(String name, CommonODataEntity entity);
-
-  /**
-   * Instantiates a new entity set navigation link.
-   * 
-   * @param name name.
-   * @param link link.
-   * @return entity set navigation link.
-   */
-  ODataLink newEntitySetNavigationLink(String name, URI link);
-
-  /**
-   * Instantiates a new entity navigation link.
-   * 
-   * @param name name.
-   * @param link link.
-   * @return entity navigation link.
-   */
-  ODataLink newEntityNavigationLink(String name, URI link);
-
-  ODataLink newAssociationLink(String name, URI link);
-
-  ODataLink newMediaEditLink(String name, URI link);
-
-  ODataPrimitiveValue.Builder newPrimitiveValueBuilder();
-
-  ODataComplexValue<? extends CommonODataProperty> newComplexValue(String typeName);
-
-  ODataCollectionValue<? extends ODataValue> newCollectionValue(String typeName);
-
-  /**
-   * Instantiates a new primitive property.
-   * 
-   * @param name name.
-   * @param value primitive value.
-   * @return primitive property.
-   */
-  CommonODataProperty newPrimitiveProperty(String name, ODataPrimitiveValue value);
-
-  /**
-   * Instantiates a new complex property.
-   * 
-   * @param name name.
-   * @param value value.
-   * @return complex property.
-   */
-  CommonODataProperty newComplexProperty(String name, ODataComplexValue<? extends CommonODataProperty> value);
-
-  /**
-   * Instantiates a new collection property.
-   * 
-   * @param name name.
-   * @param value value.
-   * @return collection property.
-   */
-  CommonODataProperty newCollectionProperty(String name, ODataCollectionValue<? extends ODataValue> value);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataProperty.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataProperty.java
deleted file mode 100644
index e357e8a..0000000
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/CommonODataProperty.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.commons.api.domain;
-
-/**
- * OData entity property.
- */
-public interface CommonODataProperty extends ODataInvokeResult {
-
-  /**
-   * Returns property name.
-   *
-   * @return property name.
-   */
-  String getName();
-
-  /**
-   * Returns property value.
-   *
-   * @return property value.
-   */
-  ODataValue getValue();
-
-  /**
-   * Checks if has null value.
-   *
-   * @return 'TRUE' if has null value; 'FALSE' otherwise.
-   */
-  boolean hasNullValue();
-
-  /**
-   * Checks if has primitive value.
-   *
-   * @return 'TRUE' if has primitive value; 'FALSE' otherwise.
-   */
-  boolean hasPrimitiveValue();
-
-  /**
-   * Gets primitive value.
-   *
-   * @return primitive value if exists; null otherwise.
-   */
-  ODataPrimitiveValue getPrimitiveValue();
-
-  /**
-   * Checks if has collection value.
-   *
-   * @return 'TRUE' if has collection value; 'FALSE' otherwise.
-   */
-  boolean hasCollectionValue();
-
-  /**
-   * Checks if has complex value.
-   *
-   * @return 'TRUE' if has complex value; 'FALSE' otherwise.
-   */
-  boolean hasComplexValue();
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java
index 98994ce..13d1e4b 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * 
  * @param <OP> The actual ODataProperty interface.
  */
-public interface ODataComplexValue<OP extends CommonODataProperty> extends ODataValue, Iterable<OP> {
+public interface ODataComplexValue<OP extends ODataProperty> extends ODataValue, Iterable<OP> {
 
   /**
    * Adds field to the complex type.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java
index bacda58..363b522 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java
@@ -18,15 +18,82 @@
  */
 package org.apache.olingo.commons.api.domain;
 
+import org.apache.olingo.commons.api.edm.FullQualifiedName;
+
 import java.net.URI;
 import java.util.List;
 
-public interface ODataEntity extends CommonODataEntity, ODataAnnotatable {
+/**
+ * OData entity.
+ */
+public interface ODataEntity extends ODataLinked, ODataAnnotatable, ODataInvokeResult {
+
+  /**
+   * @return the type name of this entity.
+   */
+  FullQualifiedName getTypeName();
+
+  /**
+   * @return self link.
+   */
+  URI getLink();
+
+  /**
+   * Returns OData entity edit link.
+   * 
+   * @return entity edit link.
+   */
+  URI getEditLink();
+
+  /**
+   * Sets OData entity edit link.
+   * 
+   * @param editLink edit link.
+   */
+  void setEditLink(URI editLink);
+
+  /**
+   * Gets ETag.
+   * 
+   * @return ETag.
+   */
+  String getETag();
+
+  /**
+   * Sets ETag.
+   * 
+   * @param eTag ETag.
+   */
+  void setETag(String eTag);
+
+  /**
+   * Searches for operation with given title.
+   * 
+   * @param title operation to look for
+   * @return operation if found with given title, <tt>null</tt> otherwise
+   */
+  ODataOperation getOperation(String title);
+
+  /**
+   * Gets operations.
+   * 
+   * @return operations.
+   */
+  List<ODataOperation> getOperations();
 
-  @Override
+  /**
+   * Searches for property with given name.
+   * 
+   * @param name property to look for
+   * @return property if found with given name, <tt>null</tt> otherwise
+   */
   ODataProperty getProperty(String name);
 
-  @Override
+  /**
+   * Returns OData entity properties.
+   *
+   * @return OData entity properties.
+   */
   List<ODataProperty> getProperties();
 
   /**
@@ -42,11 +109,94 @@ public interface ODataEntity extends CommonODataEntity, ODataAnnotatable {
    * If the resource path terminates on a single entity, the response MUST be the format-specific representation of an
    * entity reference pointing to the related single entity. If the resource path terminates on a single entity and no
    * such entity exists, the service returns 404 Not Found.
-   * 
+   *
    * @return entity reference.
    */
   URI getId();
 
+  /**
+   * Set id for this OData entity.
+   *
+   * @param id the if for this entity
+   */
   void setId(URI id);
 
+  /**
+   * Gets media-edit link with given name, if available, otherwise <tt>null</tt>.
+   * 
+   * @param name candidate link name
+   * @return media-edit link with given name, if available, otherwise <tt>null</tt>
+   */
+  ODataLink getMediaEditLink(final String name);
+
+  /**
+   * Returns entity media edit links.
+   * 
+   * @return OData entity links.
+   */
+  List<ODataLink> getMediaEditLinks();
+
+  /**
+   * TRUE if read-only entity.
+   * 
+   * @return TRUE if read-only; FALSE otherwise.
+   */
+  boolean isReadOnly();
+
+  /**
+   * Checks if the current entity is a media entity.
+   * 
+   * @return 'TRUE' if media entity; 'FALSE' otherwise.
+   */
+  boolean isMediaEntity();
+
+  /**
+   * Sets media entity flag.
+   * 
+   * @param isMediaEntity media entity flag value.
+   */
+  void setMediaEntity(boolean isMediaEntity);
+
+  /**
+   * Gets media content type.
+   * 
+   * @return media content type.
+   */
+  String getMediaContentType();
+
+  /**
+   * Sets media content type.
+   * 
+   * @param mediaContentType media content type.
+   */
+  void setMediaContentType(String mediaContentType);
+
+  /**
+   * Gets media content source.
+   * 
+   * @return media content source.
+   */
+  URI getMediaContentSource();
+
+  /**
+   * Sets media content source.
+   * 
+   * @param mediaContentSource media content source.
+   */
+  void setMediaContentSource(URI mediaContentSource);
+
+  /**
+   * ETag of the binary stream represented by this media entity or named stream property.
+   * 
+   * @return media ETag value
+   */
+  String getMediaETag();
+
+  /**
+   * Set media ETag.
+   * 
+   * @param eTag media ETag value
+   */
+  void setMediaETag(String eTag);
+
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java
index bce642a..4175f8f 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java
@@ -21,21 +21,50 @@ package org.apache.olingo.commons.api.domain;
 import java.net.URI;
 import java.util.List;
 
-public interface ODataEntitySet extends CommonODataEntitySet, ODataAnnotatable {
+/**
+ * OData entity collection. If pagination was used to get this instance, forward page navigation URI will be available.
+ */
+public interface ODataEntitySet extends ODataInvokeResult, ODataAnnotatable  {
+
+  /**
+   * Gets next page link.
+   * 
+   * @return next page link; null value if single page or last page reached.
+   */
+  URI getNext();
 
-  @Override
+  /**
+   * Gets contained entities.
+   * 
+   * @return entity set's entities.
+   */
   List<ODataEntity> getEntities();
 
   /**
+   * Gets in-line count.
+   *
+   * @return in-line count value.
+   */
+  Integer getCount();
+
+  /**
+   * Sets in-line count.
+   *
+   * @param count in-line count value.
+   */
+  void setCount(final int count);
+
+
+  /**
    * Gets delta link if exists.
-   * 
+   *
    * @return delta link if exists; null otherwise.
    */
   URI getDeltaLink();
 
   /**
    * Sets delta link.
-   * 
+   *
    * @param deltaLink delta link.
    */
   void setDeltaLink(URI deltaLink);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java
index 356f44b..a830d26 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java
@@ -27,7 +27,7 @@ import java.net.URI;
  */
 public class ODataInlineEntity extends ODataLink {
 
-  private final CommonODataEntity entity;
+  private final ODataEntity entity;
 
   /**
    * Constructor.
@@ -39,7 +39,7 @@ public class ODataInlineEntity extends ODataLink {
    * @param entity entity.
    */
   public ODataInlineEntity(final ODataServiceVersion version,
-      final URI uri, final ODataLinkType type, final String title, final CommonODataEntity entity) {
+      final URI uri, final ODataLinkType type, final String title, final ODataEntity entity) {
 
     super(version, uri, type, title);
     this.entity = entity;
@@ -56,7 +56,7 @@ public class ODataInlineEntity extends ODataLink {
    * @param entity entity.
    */
   public ODataInlineEntity(final ODataServiceVersion version, final URI baseURI, final String href,
-      final ODataLinkType type, final String title, final CommonODataEntity entity) {
+      final ODataLinkType type, final String title, final ODataEntity entity) {
 
     super(version, baseURI, href, type, title);
     this.entity = entity;
@@ -67,7 +67,7 @@ public class ODataInlineEntity extends ODataLink {
    * 
    * @return wrapped entity.
    */
-  public CommonODataEntity getEntity() {
+  public ODataEntity getEntity() {
     return entity;
   }
 }


Mime
View raw message