olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject [3/3] olingo-odata4 git commit: [OLINGO-575] Merge common with specific api in commons module
Date Mon, 23 Feb 2015 12:59:04 GMT
[OLINGO-575] Merge common with specific api in commons module


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8955af75
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8955af75
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8955af75

Branch: refs/heads/master
Commit: 8955af75cebee77b125c4d85de7963abc396f9d6
Parents: 0e6c9a1
Author: Michael Bolz <michael.bolz@sap.com>
Authored: Mon Feb 23 13:36:52 2015 +0100
Committer: Michael Bolz <michael.bolz@sap.com>
Committed: Mon Feb 23 13:36:52 2015 +0100

----------------------------------------------------------------------
 ...stractEntityCollectionInvocationHandler.java |  15 +-
 .../commons/AbstractInvocationHandler.java      |   4 +-
 .../commons/AbstractPersistenceManager.java     |  19 +-
 .../AbstractStructuredInvocationHandler.java    |  14 +-
 .../ComplexCollectionInvocationHandler.java     |   8 +-
 .../proxy/commons/ComplexInvocationHandler.java |  36 ++--
 .../EntityContainerInvocationHandler.java       |   4 +-
 .../proxy/commons/EntityInvocationHandler.java  |  39 ++--
 .../commons/EntitySetInvocationHandler.java     |   4 +-
 .../proxy/commons/InvokerInvocationHandler.java |  18 +-
 .../commons/OperationInvocationHandler.java     |   4 +-
 .../olingo/ext/proxy/utils/CoreUtils.java       |  34 ++--
 .../olingo/ext/proxy/utils/ProxyUtils.java      |  10 +-
 .../olingo/fit/AbstractBaseTestITCase.java      |   8 +-
 .../fit/tecsvc/client/ExpandSelectITCase.java   |   7 +-
 .../olingo/fit/tecsvc/client/MediaITCase.java   |  16 +-
 .../apache/olingo/fit/v4/AsyncTestITCase.java   |   7 +-
 .../olingo/fit/v4/EntityRetrieveTestITCase.java |  10 +-
 .../olingo/client/api/CommonODataClient.java    |   4 +-
 .../request/cud/CommonCUDRequestFactory.java    |  20 +--
 .../request/cud/ODataEntityCreateRequest.java   |   4 +-
 .../request/cud/ODataEntityUpdateRequest.java   |   4 +-
 .../retrieve/CommonRetrieveRequestFactory.java  |  14 +-
 .../request/retrieve/ODataEntityRequest.java    |   4 +-
 .../retrieve/ODataEntitySetIteratorRequest.java |   6 +-
 .../request/retrieve/ODataEntitySetRequest.java |   4 +-
 .../request/retrieve/ODataPropertyRequest.java  |   4 +-
 .../MediaEntityCreateStreamManager.java         |   4 +-
 .../MediaEntityUpdateStreamManager.java         |   4 +-
 .../streamed/ODataMediaEntityCreateRequest.java |   4 +-
 .../streamed/ODataMediaEntityUpdateRequest.java |   4 +-
 .../response/ODataEntityCreateResponse.java     |   4 +-
 .../response/ODataEntityUpdateResponse.java     |   4 +-
 .../ODataMediaEntityCreateResponse.java         |   4 +-
 .../ODataMediaEntityUpdateResponse.java         |   4 +-
 .../response/ODataPropertyUpdateResponse.java   |   4 +-
 .../api/domain/ODataEntitySetIterator.java      |   6 +-
 .../api/serialization/CommonODataBinder.java    |  26 +--
 .../api/serialization/CommonODataReader.java    |  12 +-
 .../client/api/serialization/ODataWriter.java   |  10 +-
 .../request/cud/AbstractCUDRequestFactory.java  |  20 +--
 .../cud/ODataEntityCreateRequestImpl.java       |   4 +-
 .../cud/ODataEntityUpdateRequestImpl.java       |   4 +-
 .../cud/ODataPropertyUpdateRequestImpl.java     |  10 +-
 .../invoke/AbstractInvokeRequestFactory.java    |  12 +-
 .../invoke/AbstractODataInvokeRequest.java      |  18 +-
 .../retrieve/ODataEntityRequestImpl.java        |   4 +-
 .../ODataEntitySetIteratorRequestImpl.java      |   6 +-
 .../retrieve/ODataEntitySetRequestImpl.java     |   4 +-
 .../retrieve/ODataPropertyRequestImpl.java      |   4 +-
 .../ODataMediaEntityCreateRequestImpl.java      |   4 +-
 .../ODataMediaEntityUpdateRequestImpl.java      |   4 +-
 .../core/serialization/AbstractODataBinder.java |  38 ++--
 .../core/serialization/AbstractODataReader.java |  14 +-
 .../core/serialization/ODataBinderImpl.java     |  19 +-
 .../core/serialization/ODataWriterImpl.java     |  14 +-
 .../commons/api/domain/AbstractODataValue.java  |   2 +-
 .../commons/api/domain/CommonODataEntity.java   | 177 -------------------
 .../api/domain/CommonODataEntitySet.java        |  57 ------
 .../api/domain/CommonODataObjectFactory.java    | 134 --------------
 .../commons/api/domain/CommonODataProperty.java |  75 --------
 .../commons/api/domain/ODataComplexValue.java   |   2 +-
 .../olingo/commons/api/domain/ODataEntity.java  | 158 ++++++++++++++++-
 .../commons/api/domain/ODataEntitySet.java      |  37 +++-
 .../commons/api/domain/ODataInlineEntity.java   |   8 +-
 .../api/domain/ODataInlineEntitySet.java        |   8 +-
 .../commons/api/domain/ODataInvokeResult.java   |   6 +-
 .../olingo/commons/api/domain/ODataItem.java    |   8 +-
 .../commons/api/domain/ODataObjectFactory.java  | 135 +++++++++++---
 .../commons/api/domain/ODataProperty.java       |  68 ++++++-
 .../olingo/commons/api/domain/ODataValue.java   |   2 +-
 .../core/domain/AbstractODataComplexValue.java  |   6 +-
 .../core/domain/AbstractODataEntity.java        |  12 +-
 .../core/domain/AbstractODataEntitySet.java     |   4 +-
 .../core/domain/AbstractODataObjectFactory.java |  12 +-
 .../core/domain/AbstractODataProperty.java      |   4 +-
 .../core/domain/ODataObjectFactoryImpl.java     |   5 +-
 .../commons/core/domain/ODataPropertyImpl.java  |   5 +-
 78 files changed, 692 insertions(+), 823 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
index 154f875..9c320f5 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
@@ -24,10 +24,9 @@ import org.apache.olingo.client.api.ODataClient;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.domain.ODataAnnotation;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataEntitySet;
+import org.apache.olingo.commons.api.domain.ODataAnnotation;
 import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 import org.apache.olingo.ext.proxy.api.EntityCollection;
 import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -98,7 +97,7 @@ public abstract class AbstractEntityCollectionInvocationHandler<
   public Triple<List<T>, URI, List<ODataAnnotation>> fetchPartial(
           final URI uri, final Class<T> typeRef) {
 
-    final List<CommonODataEntity> entities = new ArrayList<CommonODataEntity>();
+    final List<ODataEntity> entities = new ArrayList<ODataEntity>();
     final URI next;
     final List<ODataAnnotation> anns = new ArrayList<ODataAnnotation>();
 
@@ -109,15 +108,15 @@ public abstract class AbstractEntityCollectionInvocationHandler<
       entities.add(res.getBody());
       next = null;
     } else {
-      final ODataEntitySetRequest<CommonODataEntitySet> req =
+      final ODataEntitySetRequest<ODataEntitySet> req =
               getClient().getRetrieveRequestFactory().getEntitySetRequest(uri);
       if (getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) > 0) {
         req.setPrefer(getClient().newPreferences().includeAnnotations("*"));
       }
 
-      final ODataRetrieveResponse<CommonODataEntitySet> res = req.execute();
+      final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
 
-      final CommonODataEntitySet entitySet = res.getBody();
+      final ODataEntitySet entitySet = res.getBody();
       entities.addAll(entitySet.getEntities());
       next = entitySet.getNext();
       if (entitySet instanceof ODataEntitySet) {
@@ -127,7 +126,7 @@ public abstract class AbstractEntityCollectionInvocationHandler<
 
     final List<T> res = new ArrayList<T>(entities.size());
 
-    for (CommonODataEntity entity : entities) {
+    for (ODataEntity entity : entities) {
       Class<?> actualRef = null;
       if (entity.getTypeName() != null) {
         actualRef = service.getEntityTypeClass(entity.getTypeName().toString());

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
index 5689caa..2890fea 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
@@ -33,7 +33,7 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataValue;
 import org.apache.olingo.commons.api.edm.Edm;
 import org.apache.olingo.commons.api.edm.EdmEntityContainer;
@@ -156,7 +156,7 @@ abstract class AbstractInvocationHandler implements InvocationHandler {
 
     final String namespace = handler.getUUID().getType().getAnnotation(Namespace.class).value();
 
-    final CommonODataEntity template;
+    final ODataEntity template;
 
     final URI entityURI;
     if (handler.getEntityURI() == null || handler.getUUID().getKey() == null) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
index 95dfa1d..222d57b 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
@@ -41,7 +41,6 @@ import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEnt
 import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest;
 import org.apache.olingo.client.core.uri.URIUtils;
 import org.apache.olingo.commons.api.ODataRuntimeException;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
 import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataLink;
 import org.apache.olingo.commons.api.domain.ODataLinkType;
@@ -149,7 +148,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
 
     items.put(handler, null);
 
-    final CommonODataEntity entity = handler.getEntity();
+    final ODataEntity entity = handler.getEntity();
     entity.getNavigationLinks().clear();
 
     final AttachedEntityStatus currentStatus = service.getContext().entityContext().getStatus(handler);
@@ -319,7 +318,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
         pos++;
         items.put(delayedUpdate.getSource(), pos);
 
-        final CommonODataEntity changes =
+        final ODataEntity changes =
             service.getClient().getObjectFactory().newEntity(delayedUpdate.getSource().getEntity().getTypeName());
 
         AttachedEntityStatus status = service.getContext().entityContext().getStatus(delayedUpdate.getSource());
@@ -373,7 +372,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
 
   private AttachedEntityStatus queue(
       final EntityInvocationHandler handler,
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final PersistenceChanges changeset) {
 
     switch (service.getContext().entityContext().getStatus(handler)) {
@@ -397,7 +396,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
 
   private void queueCreate(
       final EntityInvocationHandler handler,
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final PersistenceChanges changeset) {
 
     LOG.debug("Create '{}'", handler);
@@ -452,7 +451,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
 
   private void queueUpdate(
       final EntityInvocationHandler handler,
-      final CommonODataEntity changes,
+      final ODataEntity changes,
       final PersistenceChanges changeset) {
 
     LOG.debug("Update '{}'", handler.getEntityURI());
@@ -462,7 +461,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
       throw new ODataRuntimeException("Only OData V4 or higher supported.");
     }
 
-    final ODataEntityUpdateRequest<CommonODataEntity> req =
+    final ODataEntityUpdateRequest<ODataEntity> req =
         ((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory().
             getEntityUpdateRequest(handler.getEntityURI(),
                 org.apache.olingo.client.api.communication.request.cud.UpdateType.PATCH, changes);
@@ -505,7 +504,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
   private void queueUpdate(
       final EntityInvocationHandler handler,
       final URI uri,
-      final CommonODataEntity changes,
+      final ODataEntity changes,
       final PersistenceChanges changeset) {
 
     LOG.debug("Update '{}'", uri);
@@ -514,7 +513,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
     if (service.getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0) {
       throw new ODataRuntimeException("Only OData V4 or higher supported.");
     }
-    final ODataEntityUpdateRequest<CommonODataEntity> req =
+    final ODataEntityUpdateRequest<ODataEntity> req =
         ((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory().
             getEntityUpdateRequest(uri,
                 org.apache.olingo.client.api.communication.request.cud.UpdateType.PATCH, changes);
@@ -530,7 +529,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
 
   private void queueDelete(
       final EntityInvocationHandler handler,
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final PersistenceChanges changeset) {
     final URI deleteURI = entity.getEditLink() == null ? handler.getEntityURI() : entity.getEditLink();
     changeset.addChange(buildDeleteRequest(deleteURI, handler.getETag()), handler);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
index ca080a3..b0b3d23 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
@@ -42,8 +42,8 @@ import org.apache.olingo.client.api.uri.CommonURIBuilder;
 import org.apache.olingo.client.api.uri.QueryOption;
 import org.apache.olingo.client.api.uri.URIBuilder;
 import org.apache.olingo.client.core.uri.URIUtils;
-import org.apache.olingo.commons.api.domain.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.ODataInlineEntity;
 import org.apache.olingo.commons.api.domain.ODataInlineEntitySet;
 import org.apache.olingo.commons.api.domain.ODataLink;
@@ -311,7 +311,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
         } else if (propertyCache.containsKey(name)) {
           res = propertyCache.get(name);
         } else {
-          final CommonODataProperty property = getInternalProperty(name);
+          final ODataProperty property = getInternalProperty(name);
 
           if (ref != null && ClassUtils.getTypeClass(type).isAnnotationPresent(ComplexType.class)) {
             res = getComplex(
@@ -496,7 +496,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
         EntityInvocationHandler handler = getContext().entityContext().getEntity(uuid);
 
         if (handler == null) {
-          final CommonODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
+          final ODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
                   collItemType.getAnnotation(Namespace.class).value(), ClassUtils.getEntityTypeName(collItemType)));
 
           handler = EntityInvocationHandler.getInstance(
@@ -545,7 +545,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
       }
     }
 
-    for (CommonODataProperty property : getInternalProperties()) {
+    for (ODataProperty property : getInternalProperties()) {
       if (!propertyNames.contains(property.getName())) {
         res.add(property.getName());
       }
@@ -648,7 +648,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
 
   public abstract boolean isChanged();
 
-  protected abstract <T extends CommonODataProperty> List<T> getInternalProperties();
+  protected abstract <T extends ODataProperty> List<T> getInternalProperties();
 
-  protected abstract CommonODataProperty getInternalProperty(final String name);
+  protected abstract ODataProperty getInternalProperty(final String name);
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java
index 551d570..7631d22 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java
@@ -33,7 +33,7 @@ import org.apache.commons.lang3.tuple.Triple;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+import org.apache.olingo.commons.api.domain.ODataProperty;
 import org.apache.olingo.commons.api.domain.ODataAnnotation;
 import org.apache.olingo.commons.api.domain.ODataCollectionValue;
 import org.apache.olingo.commons.api.domain.ODataValue;
@@ -98,17 +98,17 @@ public class ComplexCollectionInvocationHandler<T extends ComplexType<?>>
   @SuppressWarnings("unchecked")
   @Override
   public Triple<List<T>, URI, List<ODataAnnotation>> fetchPartial(final URI uri, final Class<T> typeRef) {
-    final ODataPropertyRequest<CommonODataProperty> req =
+    final ODataPropertyRequest<ODataProperty> req =
             getClient().getRetrieveRequestFactory().getPropertyRequest(uri);
     if (getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) > 0) {
       req.setPrefer(getClient().newPreferences().includeAnnotations("*"));
     }
 
-    final ODataRetrieveResponse<CommonODataProperty> res = req.execute();
+    final ODataRetrieveResponse<ODataProperty> res = req.execute();
 
     final List<T> resItems = new ArrayList<T>();
 
-    final CommonODataProperty property = res.getBody();
+    final ODataProperty property = res.getBody();
     if (property != null && property.hasCollectionValue()) {
       for (ODataValue item : (ODataCollectionValue<ODataValue>) property.getValue()) {
         Class<?> actualRef = null;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
index 1a4838e..18789b3 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
@@ -20,7 +20,7 @@ package org.apache.olingo.ext.proxy.commons;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+import org.apache.olingo.commons.api.domain.ODataProperty;
 import org.apache.olingo.commons.api.domain.ODataComplexValue;
 import org.apache.olingo.commons.api.domain.ODataLinked;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
@@ -38,7 +38,7 @@ import java.util.List;
 
 public class ComplexInvocationHandler extends AbstractStructuredInvocationHandler {
 
-  private static Pair<ODataComplexValue<? extends CommonODataProperty>, Class<?>> init(
+  private static Pair<ODataComplexValue<? extends ODataProperty>, Class<?>> init(
           final Class<?> typeRef,
           final AbstractService<?> service) {
 
@@ -56,10 +56,10 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
 
     final FullQualifiedName typeName =
             new FullQualifiedName(ClassUtils.getNamespace(complexTypeRef), annotation.name());
-    final ODataComplexValue<? extends CommonODataProperty> complex =
+    final ODataComplexValue<? extends ODataProperty> complex =
             service.getClient().getObjectFactory().newComplexValue(typeName.toString());
 
-    return new ImmutablePair<ODataComplexValue<? extends CommonODataProperty>, Class<?>>(complex, complexTypeRef);
+    return new ImmutablePair<ODataComplexValue<? extends ODataProperty>, Class<?>>(complex, complexTypeRef);
   }
 
   public static ComplexInvocationHandler getInstance(
@@ -67,7 +67,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
           final EntityInvocationHandler handler,
           final Class<?> typeRef) {
 
-    final Pair<ODataComplexValue<? extends CommonODataProperty>, Class<?>> init = init(typeRef, handler.service);
+    final Pair<ODataComplexValue<? extends ODataProperty>, Class<?>> init = init(typeRef, handler.service);
     return new ComplexInvocationHandler(init.getLeft(), init.getRight(), handler);
   }
 
@@ -83,7 +83,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
           final Class<?> typeRef,
           final AbstractService<?> service) {
       
-    final Pair<ODataComplexValue<? extends CommonODataProperty>, Class<?>> init = init(typeRef, service);
+    final Pair<ODataComplexValue<? extends ODataProperty>, Class<?>> init = init(typeRef, service);
     return new ComplexInvocationHandler(init.getLeft(), init.getRight(), service);
   }
 
@@ -92,12 +92,12 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
           final AbstractService<?> service,
           final CommonURIBuilder<?> uri) {
       
-    final Pair<ODataComplexValue<? extends CommonODataProperty>, Class<?>> init = init(typeRef, service);
+    final Pair<ODataComplexValue<? extends ODataProperty>, Class<?>> init = init(typeRef, service);
     return new ComplexInvocationHandler(init.getLeft(), init.getRight(), service, uri);
   }
 
   public static ComplexInvocationHandler getInstance(
-          final ODataComplexValue<? extends CommonODataProperty> complex,
+          final ODataComplexValue<? extends ODataProperty> complex,
           final Class<?> typeRef,
           final AbstractService<?> service,
           final CommonURIBuilder<?> uri) {
@@ -106,7 +106,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
   }
 
   private ComplexInvocationHandler(
-          final ODataComplexValue<? extends CommonODataProperty> complex,
+          final ODataComplexValue<? extends ODataProperty> complex,
           final Class<?> typeRef,
           final AbstractService<?> service,
           final CommonURIBuilder<?> uri) {
@@ -117,7 +117,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
   }
 
   private ComplexInvocationHandler(
-          final ODataComplexValue<? extends CommonODataProperty> complex,
+          final ODataComplexValue<? extends ODataProperty> complex,
           final Class<?> typeRef,
           final EntityInvocationHandler handler) {
 
@@ -126,7 +126,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
   }
 
   private ComplexInvocationHandler(
-          final ODataComplexValue<? extends CommonODataProperty> complex,
+          final ODataComplexValue<? extends ODataProperty> complex,
           final Class<?> typeRef,
           final AbstractService<?> service) {
 
@@ -135,8 +135,8 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
   }
 
   @SuppressWarnings("unchecked")
-  public ODataComplexValue<CommonODataProperty> getComplex() {
-    return (ODataComplexValue<CommonODataProperty>) this.internal;
+  public ODataComplexValue<ODataProperty> getComplex() {
+    return (ODataComplexValue<ODataProperty>) this.internal;
   }
 
   @Override
@@ -157,10 +157,10 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
   protected void load() {
     try {
       if (this.uri != null) {
-        final ODataPropertyRequest<CommonODataProperty> req =
+        final ODataPropertyRequest<ODataProperty> req =
                 getClient().getRetrieveRequestFactory().getPropertyRequest(uri.build());
 
-        final ODataRetrieveResponse<CommonODataProperty> res = req.execute();
+        final ODataRetrieveResponse<ODataProperty> res = req.execute();
         this.internal = res.getBody().getValue();
       }
     } catch (IllegalArgumentException e) {
@@ -174,10 +174,10 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
 
   @Override
   @SuppressWarnings("unchecked")
-  protected <T extends CommonODataProperty> List<T> getInternalProperties() {
+  protected <T extends ODataProperty> List<T> getInternalProperties() {
     final List<T> res = new ArrayList<T>();
     if (getComplex() != null) {
-      for (CommonODataProperty property : getComplex()) {
+      for (ODataProperty property : getComplex()) {
         res.add((T) property);
       }
     }
@@ -185,7 +185,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
   }
 
   @Override
-  protected CommonODataProperty getInternalProperty(final String name) {
+  protected ODataProperty getInternalProperty(final String name) {
     return getComplex() == null ? null : getComplex().get(name);
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java
index 33b752d..e746b8f 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.net.URI;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.api.ComplexCollection;
@@ -127,7 +127,7 @@ public final class EntityContainerInvocationHandler extends AbstractInvocationHa
     EntityInvocationHandler handler = getContext().entityContext().getEntity(uuid);
 
     if (handler == null) {
-      final CommonODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
+      final ODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
               typeRef.getAnnotation(Namespace.class).value(), ClassUtils.getEntityTypeName(typeRef)));
 
       handler = EntityInvocationHandler.getInstance(entity, uri, uri, typeRef, service);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
index 3e7457e..9e4e038 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
@@ -35,10 +35,9 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaReq
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
 import org.apache.olingo.commons.api.ODataRuntimeException;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
-import org.apache.olingo.commons.api.domain.ODataAnnotation;
 import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ODataProperty;
+import org.apache.olingo.commons.api.domain.ODataAnnotation;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
 import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 import org.apache.olingo.commons.api.format.ODataFormat;
@@ -66,7 +65,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
   private EntityUUID uuid;
 
   static EntityInvocationHandler getInstance(
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final EntitySetInvocationHandler<?, ?, ?> entitySet,
       final Class<?> typeRef) {
 
@@ -80,7 +79,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
 
   static EntityInvocationHandler getInstance(
       final Object key,
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final URI entitySetURI,
       final Class<?> typeRef,
       final AbstractService<?> service) {
@@ -89,7 +88,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
   }
 
   public static EntityInvocationHandler getInstance(
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final URI entitySetURI,
       final Class<?> typeRef,
       final AbstractService<?> service) {
@@ -98,7 +97,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
   }
 
   public static EntityInvocationHandler getInstance(
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final URI entitySetURI,
       final URI entityURI,
       final Class<?> typeRef,
@@ -132,7 +131,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
     final String namespace = typeRef.getAnnotation(Namespace.class).value();
 
     this.internal = service.getClient().getObjectFactory().newEntity(new FullQualifiedName(namespace, name));
-    CommonODataEntity.class.cast(this.internal).setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
+    ODataEntity.class.cast(this.internal).setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
 
     this.uuid = new EntityUUID(null, typeRef, null);
   }
@@ -148,7 +147,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
     final String namespace = typeRef.getAnnotation(Namespace.class).value();
 
     this.internal = service.getClient().getObjectFactory().newEntity(new FullQualifiedName(namespace, name));
-    CommonODataEntity.class.cast(this.internal).setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
+    ODataEntity.class.cast(this.internal).setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
 
     this.baseURI = entityURI;
     this.uri = entityURI == null ? null : getClient().newURIBuilder(baseURI.toASCIIString());
@@ -157,7 +156,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
   }
 
   private EntityInvocationHandler(
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final URI entitySetURI,
       final URI entityURI,
       final Class<?> typeRef,
@@ -180,7 +179,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
 
   private EntityInvocationHandler(
       final Object entityKey,
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final URI entitySetURI,
       final Class<?> typeRef,
       final AbstractService<?> service) {
@@ -210,7 +209,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
     this.uuid = new EntityUUID(entitySetURI, typeRef, key);
   }
 
-  public void setEntity(final CommonODataEntity entity) {
+  public void setEntity(final ODataEntity entity) {
     this.internal = entity;
     getEntity().setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
 
@@ -243,7 +242,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
     return uuid;
   }
 
-  public EntityUUID updateEntityUUID(final URI entitySetURI, final Class<?> type, final CommonODataEntity entity) {
+  public EntityUUID updateEntityUUID(final URI entitySetURI, final Class<?> type, final ODataEntity entity) {
     CoreUtils.addProperties(service.getClient(), this.getPropertyChanges(), entity);
     final Object key = CoreUtils.getKey(getClient(), this, this.getUUID().getType(), entity);
     return updateUUID(entitySetURI, type, key);
@@ -269,8 +268,8 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
     return uuid.getEntitySetURI();
   }
 
-  public final CommonODataEntity getEntity() {
-    return (CommonODataEntity) internal;
+  public final ODataEntity getEntity() {
+    return (ODataEntity) internal;
   }
 
   public URI getEntityURI() {
@@ -450,16 +449,16 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
     final Object key = uuid.getKey();
 
     try {
-      final ODataEntityRequest<CommonODataEntity> req =
+      final ODataEntityRequest<ODataEntity> req =
           getClient().getRetrieveRequestFactory().getEntityRequest(uri.build());
 
       if (getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) > 0) {
         req.setPrefer(getClient().newPreferences().includeAnnotations("*"));
       }
 
-      final ODataRetrieveResponse<CommonODataEntity> res = req.execute();
+      final ODataRetrieveResponse<ODataEntity> res = req.execute();
 
-      final CommonODataEntity entity = res.getBody();
+      final ODataEntity entity = res.getBody();
       if (entity == null) {
         throw new IllegalArgumentException("Invalid " + typeRef.getSimpleName() + "(" + key + ")");
       }
@@ -486,12 +485,12 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
 
   @Override
   @SuppressWarnings("unchecked")
-  protected <T extends CommonODataProperty> List<T> getInternalProperties() {
+  protected <T extends ODataProperty> List<T> getInternalProperties() {
     return getEntity() == null ? Collections.<T> emptyList() : (List<T>) getEntity().getProperties();
   }
 
   @Override
-  protected CommonODataProperty getInternalProperty(final String name) {
+  protected ODataProperty getInternalProperty(final String name) {
     return getEntity() == null ? null : getEntity().getProperty(name);
   }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java
index e185344..5363b7d 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java
@@ -31,7 +31,7 @@ import org.apache.commons.lang3.tuple.Triple;
 import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataAnnotation;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
 import org.apache.olingo.commons.api.format.ODataFormat;
@@ -129,7 +129,7 @@ public class EntitySetInvocationHandler<
     EntityInvocationHandler handler = getContext().entityContext().getEntity(uuid);
 
     if (handler == null) {
-      final CommonODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
+      final ODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
               typeRef.getAnnotation(Namespace.class).value(), ClassUtils.getEntityTypeName(typeRef)));
 
       handler = EntityInvocationHandler.getInstance(key, entity, this.baseURI, typeRef, service);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java
index 8e23613..7c5e2f6 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java
@@ -34,9 +34,9 @@ import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
 import org.apache.olingo.client.api.uri.URIFilter;
 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.edm.EdmFunction;
@@ -143,13 +143,13 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
                   collItemType,
                   targetRef,
                   null,
-                  (CommonODataEntitySet) result,
+                  (ODataEntitySet) result,
                   this.baseURI,
                   false);
         } else {
           return (T) ProxyUtils.getEntityProxy(
                   service,
-                  (CommonODataEntity) result,
+                  (ODataEntity) result,
                   null,
                   targetRef,
                   null,
@@ -159,7 +159,7 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
         Object res;
 
         final Class<?> ref = ClassUtils.getTypeClass(targetRef);
-        final CommonODataProperty property = (CommonODataProperty) result;
+        final ODataProperty property = (ODataProperty) result;
 
         if (property == null || property.hasNullValue()) {
           res = null;
@@ -225,11 +225,11 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
       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/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java
index 0a2ed7c..7427944 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java
@@ -29,7 +29,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Operation;
 import org.apache.olingo.ext.proxy.api.annotations.Parameter;
 import org.apache.olingo.ext.proxy.utils.ClassUtils;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataValue;
 import org.apache.olingo.commons.api.edm.EdmEntityContainer;
 import org.apache.olingo.commons.core.edm.EdmTypeInfo;
@@ -238,7 +238,7 @@ final class OperationInvocationHandler extends AbstractInvocationHandler {
   }
 
   private Map.Entry<URI, EdmOperation> getBoundOperation(final Operation operation, final List<String> parameterNames) {
-    final CommonODataEntity entity = EntityInvocationHandler.class.cast(target).getEntity();
+    final ODataEntity entity = EntityInvocationHandler.class.cast(target).getEntity();
     final URI entityURI = EntityInvocationHandler.class.cast(target).getEntityURI();
 
     ODataOperation boundOp = entity.getOperation(operation.name());

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java
index a3cc3a0..cd89e09 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java
@@ -40,8 +40,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
 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.ODataAnnotatable;
 import org.apache.olingo.commons.api.domain.ODataAnnotation;
 import org.apache.olingo.commons.api.domain.ODataComplexValue;
@@ -149,7 +149,7 @@ public final class CoreUtils {
     return value;
   }
 
-  private static CommonODataProperty getODataEntityProperty(
+  private static ODataProperty getODataEntityProperty(
       final CommonEdmEnabledODataClient<?> client,
       final FullQualifiedName entity,
       final String property,
@@ -159,7 +159,7 @@ public final class CoreUtils {
     return getODataProperty(client, edmProperty, property, obj);
   }
 
-  private static CommonODataProperty getODataComplexProperty(
+  private static ODataProperty getODataComplexProperty(
       final CommonEdmEnabledODataClient<?> client,
       final FullQualifiedName complex,
       final String property,
@@ -169,7 +169,7 @@ public final class CoreUtils {
     return getODataProperty(client, edmProperty, property, obj);
   }
 
-  private static CommonODataProperty getODataProperty(
+  private static ODataProperty getODataProperty(
       final CommonEdmEnabledODataClient<?> client,
       final EdmElement edmProperty,
       final String property,
@@ -211,10 +211,10 @@ public final class CoreUtils {
     return annotation;
   }
 
-  public static CommonODataProperty getODataProperty(
+  public static ODataProperty getODataProperty(
       final CommonEdmEnabledODataClient<?> client, final String name, final EdmTypeInfo type, final Object obj) {
 
-    CommonODataProperty property;
+    ODataProperty property;
 
     try {
       if (obj == null) {
@@ -298,10 +298,10 @@ public final class CoreUtils {
   public static void addProperties(
       final CommonEdmEnabledODataClient<?> client,
       final Map<String, Object> changes,
-      final CommonODataEntity entity) {
+      final ODataEntity entity) {
 
     for (Map.Entry<String, Object> entry : changes.entrySet()) {
-      ((List<CommonODataProperty>) entity.getProperties()).add(
+      ((List<ODataProperty>) entity.getProperties()).add(
           getODataEntityProperty(client, entity.getTypeName(), entry.getKey(), entry.getValue()));
     }
   }
@@ -309,7 +309,7 @@ public final class CoreUtils {
   public static void addProperties(
       final CommonEdmEnabledODataClient<?> client,
       final Map<String, Object> changes,
-      final ODataComplexValue<CommonODataProperty> entity) {
+      final ODataComplexValue<ODataProperty> entity) {
 
     for (Map.Entry<String, Object> entry : changes.entrySet()) {
       entity.add(getODataComplexProperty(
@@ -389,7 +389,7 @@ public final class CoreUtils {
   public static CommonURIBuilder<?> buildEditLink(
       final CommonEdmEnabledODataClient<?> client,
       final String entitySetURI,
-      final CommonODataEntity entity,
+      final ODataEntity entity,
       final Object key) {
 
     if (key == null) {
@@ -439,14 +439,14 @@ public final class CoreUtils {
       final CommonEdmEnabledODataClient<?> client,
       final EntityInvocationHandler typeHandler,
       final Class<?> entityTypeRef,
-      final CommonODataEntity entity) {
+      final ODataEntity entity) {
 
     Object res = null;
 
     if (!entity.getProperties().isEmpty()) {
       final Class<?> keyRef = ClassUtils.getCompoundKeyRef(entityTypeRef);
       if (keyRef == null) {
-        final CommonODataProperty property = entity.getProperty(firstValidEntityKey(entityTypeRef));
+        final ODataProperty property = entity.getProperty(firstValidEntityKey(entityTypeRef));
         if (property != null && property.hasPrimitiveValue()) {
           res = primitiveValueToObject(
               property.getPrimitiveValue(), getPropertyClass(entityTypeRef, property.getName()));
@@ -470,7 +470,7 @@ public final class CoreUtils {
       final EntityInvocationHandler typeHandler,
       final Object bean,
       final Class<? extends Annotation> getterAnn,
-      final Iterator<? extends CommonODataProperty> propItor) {
+      final Iterator<? extends ODataProperty> propItor) {
 
     if (bean != null) {
       final Class<?> typeRef;
@@ -495,11 +495,11 @@ public final class CoreUtils {
       final Object bean,
       final Class<?> typeRef,
       final Class<? extends Annotation> getterAnn,
-      final Iterator<? extends CommonODataProperty> propItor) {
+      final Iterator<? extends ODataProperty> propItor) {
 
     if (bean != null) {
       while (propItor.hasNext()) {
-        final CommonODataProperty property = propItor.next();
+        final ODataProperty property = propItor.next();
 
         final Method getter = ClassUtils.findGetterByAnnotatedName(typeRef, getterAnn, property.getName());
 
@@ -657,7 +657,7 @@ public final class CoreUtils {
     return null;
   }
 
-  public static URI getMediaEditLink(final String name, final CommonODataEntity entity) {
+  public static URI getMediaEditLink(final String name, final ODataEntity entity) {
     final ODataLink mediaEditLink = entity.getMediaEditLink(name);
     return mediaEditLink == null ? URIUtils.getURI(entity.getEditLink(), name) : mediaEditLink.getLink();
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java
index 7e7ccb4..d70ca4b 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ProxyUtils.java
@@ -21,8 +21,8 @@ import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
-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.domain.ODataValue;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.commons.ComplexInvocationHandler;
@@ -38,14 +38,14 @@ public class ProxyUtils {
           final Class<?> typeRef,
           final Class<?> typeCollectionRef,
           final URI targetEntitySetURI,
-          final CommonODataEntitySet entitySet,
+          final ODataEntitySet entitySet,
           final URI uri,
           final boolean checkInTheContext) {
 
     final List<Object> items = new ArrayList<Object>();
 
     if (entitySet != null) {
-      for (CommonODataEntity entityFromSet : entitySet.getEntities()) {
+      for (ODataEntity entityFromSet : entitySet.getEntities()) {
         items.add(getEntityProxy(service, entityFromSet, uri, typeRef, null, checkInTheContext));
       }
     }
@@ -70,7 +70,7 @@ public class ProxyUtils {
 
   public static Object getEntityProxy(
           final AbstractService<?> service,
-          final CommonODataEntity entity,
+          final ODataEntity entity,
           final URI entitySetURI,
           final Class<?> type,
           final String eTag,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
index 54658ae..3856318 100644
--- a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
@@ -32,8 +32,8 @@ import org.apache.commons.io.IOUtils;
 import org.apache.olingo.client.api.CommonODataClient;
 import org.apache.olingo.commons.api.data.Entity;
 import org.apache.olingo.commons.api.data.EntitySet;
-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.ODataValue;
 import org.apache.olingo.commons.api.format.ODataFormat;
 import org.apache.olingo.commons.api.serialization.ODataSerializerException;
@@ -90,7 +90,7 @@ public abstract class AbstractBaseTestITCase {
     }
   }
 
-  protected void debugODataProperty(final CommonODataProperty property, final String message) {
+  protected void debugODataProperty(final ODataProperty property, final String message) {
     LOG.debug(message + "\n{}", property.toString());
   }
 
@@ -98,7 +98,7 @@ public abstract class AbstractBaseTestITCase {
     LOG.debug(message + "\n{}", value.toString());
   }
 
-  protected void debugODataEntity(final CommonODataEntity entity, final String message) {
+  protected void debugODataEntity(final ODataEntity entity, final String message) {
     if (LOG.isDebugEnabled()) {
       StringWriter writer = new StringWriter();
       try {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java
index 97aa06b..a4773ee 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandSelectITCase.java
@@ -28,7 +28,6 @@ import org.apache.olingo.client.api.CommonODataClient;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
 import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataInlineEntity;
 import org.apache.olingo.commons.api.domain.ODataInlineEntitySet;
@@ -104,10 +103,10 @@ public final class ExpandSelectITCase extends AbstractBaseTestITCase {
     assertEquals(ODataLinkType.ENTITY_SET_NAVIGATION, link.getType());
     final ODataInlineEntitySet inlineEntitySet = link.asInlineEntitySet();
     assertNotNull(inlineEntitySet);
-    final List<? extends CommonODataEntity> entities = inlineEntitySet.getEntitySet().getEntities();
+    final List<? extends ODataEntity> entities = inlineEntitySet.getEntitySet().getEntities();
     assertNotNull(entities);
     assertEquals(2, entities.size());
-    final CommonODataEntity inlineEntity = entities.get(0);
+    final ODataEntity inlineEntity = entities.get(0);
     assertEquals(2, inlineEntity.getProperties().size());
     assertEquals(-128, inlineEntity.getProperty("PropertySByte").getPrimitiveValue().toValue());
     assertEquals(new java.sql.Timestamp(85754000),
@@ -143,7 +142,7 @@ public final class ExpandSelectITCase extends AbstractBaseTestITCase {
     final ODataLink innerLink = inlineEntity.getEntity().getNavigationLink("NavPropertyETTwoPrimOne");
     assertNotNull(innerLink);
     assertEquals(ODataLinkType.ENTITY_NAVIGATION, innerLink.getType());
-    final CommonODataEntity innerEntity = innerLink.asInlineEntity().getEntity();
+    final ODataEntity innerEntity = innerLink.asInlineEntity().getEntity();
     assertNotNull(innerEntity);
     assertEquals(2, innerEntity.getProperties().size());
     assertEquals(32767, innerEntity.getProperty("PropertyInt16").getPrimitiveValue().toValue());

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java
index e1a56b9..f4c9e93 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java
@@ -40,8 +40,8 @@ import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreat
 import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.commons.api.domain.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.format.ContentType;
 import org.apache.olingo.commons.api.format.ODataFormat;
 import org.apache.olingo.commons.api.http.HttpHeader;
@@ -97,13 +97,13 @@ public final class MediaITCase extends AbstractBaseTestITCase {
     final CommonODataClient<?> client = getClient();
     final URI uri = client.newURIBuilder(TecSvcConst.BASE_URI)
         .appendEntitySetSegment("ESMedia").appendKeySegment(4).appendValueSegment().build();
-    ODataMediaEntityUpdateRequest<CommonODataEntity> request =
+    ODataMediaEntityUpdateRequest<ODataEntity> request =
         client.getCUDRequestFactory().getMediaEntityUpdateRequest(uri,
             IOUtils.toInputStream("just a test"));
     request.setContentType(ContentType.TEXT_PLAIN.toContentTypeString());
     assertNotNull(request);
 
-    final ODataMediaEntityUpdateResponse<CommonODataEntity> response = request.payloadManager().getResponse();
+    final ODataMediaEntityUpdateResponse<ODataEntity> response = request.payloadManager().getResponse();
     assertEquals(HttpStatusCode.NO_CONTENT.getStatusCode(), response.getStatusCode());
 
     // Check that the media stream has changed.
@@ -119,19 +119,19 @@ public final class MediaITCase extends AbstractBaseTestITCase {
   @Test
   public void create() throws Exception {
     final CommonODataClient<?> client = getClient();
-    ODataMediaEntityCreateRequest<CommonODataEntity> request =
+    ODataMediaEntityCreateRequest<ODataEntity> request =
         client.getCUDRequestFactory().getMediaEntityCreateRequest(
             client.newURIBuilder(TecSvcConst.BASE_URI).appendEntitySetSegment("ESMedia").build(),
             IOUtils.toInputStream("just a test"));
     request.setContentType(ContentType.TEXT_PLAIN.toContentTypeString());
     assertNotNull(request);
 
-    final ODataMediaEntityCreateResponse<CommonODataEntity> response = request.payloadManager().getResponse();
+    final ODataMediaEntityCreateResponse<ODataEntity> response = request.payloadManager().getResponse();
     assertEquals(HttpStatusCode.CREATED.getStatusCode(), response.getStatusCode());
     assertEquals(request.getURI() + "(5)", response.getHeader(HttpHeader.LOCATION).iterator().next());
-    final CommonODataEntity entity = response.getBody();
+    final ODataEntity entity = response.getBody();
     assertNotNull(entity);
-    final CommonODataProperty property = entity.getProperty("PropertyInt16");
+    final ODataProperty property = entity.getProperty("PropertyInt16");
     assertNotNull(property);
     assertNotNull(property.getPrimitiveValue());
     assertEquals(5, property.getPrimitiveValue().toValue());

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
index 0f0fc80..1008de9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
@@ -24,9 +24,8 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe
 import org.apache.olingo.client.api.communication.response.AsyncResponseWrapper;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.commons.api.domain.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.ODataEntitySet;
 import org.apache.olingo.commons.api.domain.ODataInlineEntity;
 import org.apache.olingo.commons.api.domain.ODataLink;
@@ -95,10 +94,10 @@ public class AsyncTestITCase extends AbstractTestITCase {
 
     for (ODataLink link : entity.getNavigationLinks()) {
       if (link instanceof ODataInlineEntity) {
-        final CommonODataEntity inline = ((ODataInlineEntity) link).getEntity();
+        final ODataEntity inline = ((ODataInlineEntity) link).getEntity();
         assertNotNull(inline);
 
-        final List<? extends CommonODataProperty> properties = inline.getProperties();
+        final List<? extends ODataProperty> properties = inline.getProperties();
         assertEquals(5, properties.size());
 
         assertTrue(properties.get(0).getName().equals("CompanyID")

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
index 95b9ae6..3717fb1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
@@ -32,11 +32,9 @@ import org.apache.olingo.client.api.communication.response.ODataRawResponse;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.client.api.uri.URIBuilder;
 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.ODataInlineEntity;
 import org.apache.olingo.commons.api.domain.ODataInlineEntitySet;
 import org.apache.olingo.commons.api.domain.ODataLink;
@@ -85,10 +83,10 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
 
       for (ODataLink link : entity.getNavigationLinks()) {
         if (link instanceof ODataInlineEntity) {
-          final CommonODataEntity inline = ((ODataInlineEntity) link).getEntity();
+          final ODataEntity inline = ((ODataInlineEntity) link).getEntity();
           assertNotNull(inline);
 
-          final List<? extends CommonODataProperty> properties = inline.getProperties();
+          final List<? extends ODataProperty> properties = inline.getProperties();
           assertEquals(5, properties.size());
 
           assertTrue(properties.get(0).getName().equals("CompanyID")
@@ -143,7 +141,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
       boolean found = false;
       for (ODataLink link : entity.getNavigationLinks()) {
         if (link instanceof ODataInlineEntitySet) {
-          final CommonODataEntitySet inline = ((ODataInlineEntitySet) link).getEntitySet();
+          final ODataEntitySet inline = ((ODataInlineEntitySet) link).getEntitySet();
           assertNotNull(inline);
 
           found = true;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java
index d04e2a1..cdfcff6 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java
@@ -31,7 +31,7 @@ import org.apache.olingo.client.api.serialization.CommonODataReader;
 import org.apache.olingo.client.api.serialization.ODataWriter;
 import org.apache.olingo.client.api.uri.CommonFilterFactory;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
-import org.apache.olingo.commons.api.domain.CommonODataObjectFactory;
+import org.apache.olingo.commons.api.domain.ODataObjectFactory;
 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;
@@ -65,7 +65,7 @@ public interface CommonODataClient<UT extends CommonUpdateType> {
 
   CommonODataBinder getBinder();
 
-  CommonODataObjectFactory getObjectFactory();
+  ODataObjectFactory getObjectFactory();
 
   CommonRetrieveRequestFactory getRetrieveRequestFactory();
 

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/cud/CommonCUDRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java
index a03e05e..6cd6c92 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java
@@ -24,8 +24,8 @@ import java.net.URI;
 import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest;
 import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest;
 import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest;
-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;
 
 /**
@@ -45,7 +45,7 @@ public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
    * @param entity entity to be created.
    * @return new ODataEntityCreateRequest instance.
    */
-  <E extends CommonODataEntity> ODataEntityCreateRequest<E> getEntityCreateRequest(URI targetURI, E entity);
+  <E extends ODataEntity> ODataEntityCreateRequest<E> getEntityCreateRequest(URI targetURI, E entity);
 
   /**
    * Gets an update request object instance.
@@ -56,7 +56,7 @@ public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
    * @param changes changes to be applied.
    * @return new ODataEntityUpdateRequest instance.
    */
-  <E extends CommonODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(URI targetURI, UT type, E changes);
+  <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(URI targetURI, UT type, E changes);
 
   /**
    * Gets an update request object instance; uses entity's edit link as endpoint.
@@ -66,7 +66,7 @@ public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
    * @param entity changes to be applied.
    * @return new ODataEntityUpdateRequest instance.
    */
-  <E extends CommonODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(UT type, E entity);
+  <E extends ODataEntity> ODataEntityUpdateRequest<E> getEntityUpdateRequest(UT type, E entity);
 
   /**
    * Gets a create request object instance.
@@ -89,7 +89,7 @@ public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
    * @param property value to be update.
    * @return new ODataPropertyUpdateRequest instance.
    */
-  ODataPropertyUpdateRequest getPropertyPrimitiveValueUpdateRequest(URI targetURI, CommonODataProperty property);
+  ODataPropertyUpdateRequest getPropertyPrimitiveValueUpdateRequest(URI targetURI, ODataProperty property);
 
   /**
    * Gets an update request object instance.
@@ -101,7 +101,7 @@ public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
    * @param property value to be update.
    * @return new ODataPropertyUpdateRequest instance.
    */
-  ODataPropertyUpdateRequest getPropertyComplexValueUpdateRequest(URI targetURI, UT type, CommonODataProperty property);
+  ODataPropertyUpdateRequest getPropertyComplexValueUpdateRequest(URI targetURI, UT type, ODataProperty property);
 
   /**
    * Gets an update request object instance.
@@ -112,7 +112,7 @@ public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
    * @param property value to be update.
    * @return new ODataPropertyUpdateRequest instance.
    */
-  ODataPropertyUpdateRequest getPropertyCollectionValueUpdateRequest(URI targetURI, CommonODataProperty property);
+  ODataPropertyUpdateRequest getPropertyCollectionValueUpdateRequest(URI targetURI, ODataProperty property);
 
   /**
    * Gets a delete request object instance.
@@ -134,7 +134,7 @@ public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
    * @param media entity blob to be created.
    * @return new ODataMediaEntityCreateRequest instance.
    */
-  <E extends CommonODataEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest(
+  <E extends ODataEntity> ODataMediaEntityCreateRequest<E> getMediaEntityCreateRequest(
           URI targetURI, InputStream media);
 
   /**
@@ -158,6 +158,6 @@ public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
    * @param media entity blob to be updated.
    * @return new ODataMediaEntityUpdateRequest instance.
    */
-  <E extends CommonODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest(
+  <E extends ODataEntity> ODataMediaEntityUpdateRequest<E> getMediaEntityUpdateRequest(
           URI editURI, InputStream media);
 }

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/cud/ODataEntityCreateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java
index d13254a..5865607 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java
@@ -21,13 +21,13 @@ package org.apache.olingo.client.api.communication.request.cud;
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 
 /**
  * This interface describes an OData create request.
  *
  * @param <E> concrete ODataEntity implementation
  */
-public interface ODataEntityCreateRequest<E extends CommonODataEntity>
+public interface ODataEntityCreateRequest<E extends ODataEntity>
     extends ODataBasicRequest<ODataEntityCreateResponse<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/request/cud/ODataEntityUpdateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java
index d2c48a9..5469de2 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java
@@ -21,13 +21,13 @@ package org.apache.olingo.client.api.communication.request.cud;
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 
 /**
  * This class implements an OData update request.
  *
  * @param <E> concrete ODataEntity implementation
  */
-public interface ODataEntityUpdateRequest<E extends CommonODataEntity>
+public interface ODataEntityUpdateRequest<E extends ODataEntity>
     extends ODataBasicRequest<ODataEntityUpdateResponse<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/request/retrieve/CommonRetrieveRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java
index dfb6a22..2f98c3f 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java
@@ -20,9 +20,9 @@ package org.apache.olingo.client.api.communication.request.retrieve;
 
 import java.net.URI;
 
-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;
 
 /**
  * OData request factory class.
@@ -66,7 +66,7 @@ public interface CommonRetrieveRequestFactory {
    * @param uri request URI.
    * @return new {@link ODataEntitySetRequest} instance.
    */
-  <T extends CommonODataEntitySet> ODataEntitySetRequest<T> getEntitySetRequest(URI uri);
+  <T extends ODataEntitySet> ODataEntitySetRequest<T> getEntitySetRequest(URI uri);
 
   /**
    * Gets a uri request returning a set of one or more OData entities.
@@ -79,7 +79,7 @@ public interface CommonRetrieveRequestFactory {
    * @param uri request URI.
    * @return new {@link ODataEntitySetIteratorRequest} instance.
    */
-  <ES extends CommonODataEntitySet, E extends CommonODataEntity>
+  <ES extends ODataEntitySet, E extends ODataEntity>
           ODataEntitySetIteratorRequest<ES, E> getEntitySetIteratorRequest(URI uri);
 
   /**
@@ -89,7 +89,7 @@ public interface CommonRetrieveRequestFactory {
    * @param uri request URI.
    * @return new {@link ODataEntityRequest} instance.
    */
-  <T extends CommonODataEntity> ODataEntityRequest<T> getEntityRequest(URI uri);
+  <T extends ODataEntity> ODataEntityRequest<T> getEntityRequest(URI uri);
 
   /**
    * Gets a uri request returning a single OData entity property.
@@ -98,7 +98,7 @@ public interface CommonRetrieveRequestFactory {
    * @param uri request URI.
    * @return new {@link ODataPropertyRequest} instance.
    */
-  <T extends CommonODataProperty> ODataPropertyRequest<T> getPropertyRequest(URI uri);
+  <T extends ODataProperty> ODataPropertyRequest<T> getPropertyRequest(URI uri);
   
   /**
    * Gets a uri request returning a single OData entity property value.

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/retrieve/ODataEntityRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java
index 239fbed..d7081c4 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java
@@ -18,10 +18,10 @@
  */
 package org.apache.olingo.client.api.communication.request.retrieve;
 
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 
 /**
  * Describes an OData retrieve query request returning a single entity.
  */
-public interface ODataEntityRequest<E extends CommonODataEntity> extends ODataRetrieveRequest<E> {
+public interface ODataEntityRequest<E extends ODataEntity> extends ODataRetrieveRequest<E> {
 }

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/retrieve/ODataEntitySetIteratorRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java
index 0b442a5..6a70f0d 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java
@@ -19,12 +19,12 @@
 package org.apache.olingo.client.api.communication.request.retrieve;
 
 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;
 
 /**
  * This class implements an OData EntitySet query request.
  */
-public interface ODataEntitySetIteratorRequest<ES extends CommonODataEntitySet, E extends CommonODataEntity>
+public interface ODataEntitySetIteratorRequest<ES extends ODataEntitySet, E extends ODataEntity>
         extends ODataRetrieveRequest<ODataEntitySetIterator<ES, E>> {
 }

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/retrieve/ODataEntitySetRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java
index 766b6d0..ba863f4 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java
@@ -18,12 +18,12 @@
  */
 package org.apache.olingo.client.api.communication.request.retrieve;
 
-import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
+import org.apache.olingo.commons.api.domain.ODataEntitySet;
 
 /**
  * This interface describes an OData EntitySet query request.
  *
  * @param <ES> concrete ODataEntitySet implementation
  */
-public interface ODataEntitySetRequest<ES extends CommonODataEntitySet> extends ODataRetrieveRequest<ES> {
+public interface ODataEntitySetRequest<ES extends ODataEntitySet> extends ODataRetrieveRequest<ES> {
 }

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/retrieve/ODataPropertyRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java
index 9ee4860..90375f9 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java
@@ -18,10 +18,10 @@
  */
 package org.apache.olingo.client.api.communication.request.retrieve;
 
-import org.apache.olingo.commons.api.domain.CommonODataProperty;
+import org.apache.olingo.commons.api.domain.ODataProperty;
 
 /**
  * This class implements an OData entity property query request.
  */
-public interface ODataPropertyRequest<T extends CommonODataProperty> extends ODataRetrieveRequest<T> {
+public interface ODataPropertyRequest<T extends ODataProperty> extends ODataRetrieveRequest<T> {
 }

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/MediaEntityCreateStreamManager.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/MediaEntityCreateStreamManager.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/MediaEntityCreateStreamManager.java
index 74d5827..cdcb6d1 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/MediaEntityCreateStreamManager.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/MediaEntityCreateStreamManager.java
@@ -20,13 +20,13 @@ package org.apache.olingo.client.api.communication.request.streamed;
 
 import org.apache.olingo.client.api.communication.request.ODataPayloadManager;
 import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse;
-import org.apache.olingo.commons.api.domain.CommonODataEntity;
+import org.apache.olingo.commons.api.domain.ODataEntity;
 
 /**
  * Media entity payload object.
  *
  * @param <E> concrete ODataEntity implementation
  */
-public interface MediaEntityCreateStreamManager<E extends CommonODataEntity>
+public interface MediaEntityCreateStreamManager<E extends ODataEntity>
         extends ODataPayloadManager<ODataMediaEntityCreateResponse<E>> {
 }

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/MediaEntityUpdateStreamManager.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/MediaEntityUpdateStreamManager.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/MediaEntityUpdateStreamManager.java
index 0fa37d5..31efdf7 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/MediaEntityUpdateStreamManager.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/MediaEntityUpdateStreamManager.java
@@ -20,13 +20,13 @@ package org.apache.olingo.client.api.communication.request.streamed;
 
 import org.apache.olingo.client.api.communication.request.ODataPayloadManager;
 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;
 
 /**
  * Media entity payload object.
  *
  * @param <E> concrete ODataEntity implementation
  */
-public interface MediaEntityUpdateStreamManager<E extends CommonODataEntity>
+public interface MediaEntityUpdateStreamManager<E extends ODataEntity>
         extends ODataPayloadManager<ODataMediaEntityUpdateResponse<E>> {
 }

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/ODataMediaEntityCreateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataMediaEntityCreateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataMediaEntityCreateRequest.java
index c70bca6..ad21a72 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataMediaEntityCreateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataMediaEntityCreateRequest.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.ODataMediaEntityCreateResponse;
-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 ODataMediaEntityCreateRequest<E extends CommonODataEntity>
+public interface ODataMediaEntityCreateRequest<E extends ODataEntity>
         extends ODataStreamedEntityRequest<ODataMediaEntityCreateResponse<E>, MediaEntityCreateStreamManager<E>>,
         ODataBatchableRequest{
 }


Mime
View raw message