olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rare...@apache.org
Subject [12/22] olingo-odata4 git commit: [OLINGO-603] Rename entity set to entity collection
Date Mon, 20 Apr 2015 14:28:32 GMT
[OLINGO-603] Rename entity set to entity collection


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

Branch: refs/heads/OLINGO-573
Commit: d692d129bddbdd63adfbd58aacabc0e5a3bf4db1
Parents: 05935a0
Author: Christian Amend <chrisam@apache.org>
Authored: Tue Apr 7 15:20:39 2015 +0200
Committer: Christian Amend <chrisam@apache.org>
Committed: Tue Apr 7 15:20:39 2015 +0200

----------------------------------------------------------------------
 .../org/apache/olingo/fit/AbstractServices.java |  10 +-
 .../java/org/apache/olingo/fit/V4Services.java  |  18 ++--
 .../olingo/fit/utils/AbstractUtilities.java     |   6 +-
 .../olingo/fit/AbstractBaseTestITCase.java      |   4 +-
 .../fit/v4/JSONFormatConformanceTestITCase.java |   4 +-
 .../client/api/serialization/ODataBinder.java   |   8 +-
 .../retrieve/ODataEntitySetRequestImpl.java     |  23 +++--
 .../ClientODataDeserializerImpl.java            |   4 +-
 .../core/serialization/ODataBinderImpl.java     |  16 +--
 .../core/serialization/ODataReaderImpl.java     |   4 +-
 .../olingo/client/core/v4/EntitySetTest.java    |  26 ++---
 .../apache/olingo/commons/api/data/Delta.java   |   2 +-
 .../commons/api/data/EntityCollection.java      |  97 +++++++++++++++++
 .../olingo/commons/api/data/EntitySet.java      |  97 -----------------
 .../apache/olingo/commons/api/data/Link.java    |   6 +-
 .../api/serialization/ODataDeserializer.java    |   6 +-
 .../core/serialization/AtomDeserializer.java    |  10 +-
 .../core/serialization/AtomSerializer.java      |  20 ++--
 .../core/serialization/JsonDeserializer.java    |   6 +-
 .../JsonEntitySetDeserializer.java              |   8 +-
 .../serialization/JsonEntitySetSerializer.java  |  10 +-
 .../core/serialization/JsonSerializer.java      |  10 +-
 .../serialization/AtomDeserializerTest.java     |   6 +-
 .../api/deserializer/DeserializerResult.java    |   6 +-
 .../api/deserializer/ODataDeserializer.java     |   4 +-
 .../server/api/serializer/ODataSerializer.java  |   4 +-
 .../deserializer/DeserializerResultImpl.java    |  10 +-
 .../json/ODataJsonDeserializer.java             |   8 +-
 .../serializer/json/ODataJsonSerializer.java    |   6 +-
 .../serializer/xml/ODataXmlSerializerImpl.java  |   4 +-
 .../olingo/server/tecsvc/data/DataCreator.java  | 100 +++++++++---------
 .../olingo/server/tecsvc/data/DataProvider.java |  16 +--
 .../olingo/server/tecsvc/data/FunctionData.java |  12 +--
 .../server/tecsvc/data/RequestValidator.java    |   4 +-
 .../processor/TechnicalEntityProcessor.java     |  12 +--
 .../tecsvc/processor/TechnicalProcessor.java    |   4 +-
 .../ExpandSystemQueryOptionHandler.java         | 103 ++++++++++---------
 .../queryoptions/options/CountHandler.java      |   4 +-
 .../queryoptions/options/FilterHandler.java     |   4 +-
 .../queryoptions/options/OrderByHandler.java    |   6 +-
 .../options/ServerSidePagingHandler.java        |   4 +-
 .../queryoptions/options/SkipHandler.java       |   6 +-
 .../queryoptions/options/TopHandler.java        |   6 +-
 .../server/tecsvc/data/DataProviderTest.java    |  12 +--
 .../ODataDeserializerEntityCollectionTest.java  |   8 +-
 .../json/ODataJsonSerializerTest.java           |  12 +--
 .../olingo/server/sample/data/DataProvider.java |  18 ++--
 .../server/sample/processor/CarsProcessor.java  |   4 +-
 48 files changed, 391 insertions(+), 387 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
index a57f11b..01f0d92 100644
--- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
+++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
@@ -70,7 +70,7 @@ import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
 import org.apache.olingo.commons.api.data.ComplexValue;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
@@ -997,7 +997,7 @@ public abstract class AbstractServices {
 
         final InputStream feed = FSManager.instance(version).readFile(builder.toString(), Accept.ATOM);
 
-        final ResWrap<EntitySet> container = atomDeserializer.toEntitySet(feed);
+        final ResWrap<EntityCollection> container = atomDeserializer.toEntitySet(feed);
 
         setInlineCount(container.getPayload(), count);
 
@@ -1040,7 +1040,7 @@ public abstract class AbstractServices {
     }
   }
 
-  protected abstract void setInlineCount(final EntitySet feed, final String count);
+  protected abstract void setInlineCount(final EntityCollection feed, final String count);
 
   @GET
   @Path("/Person({entityId})")
@@ -1256,7 +1256,7 @@ public abstract class AbstractServices {
               rep.setInlineEntity(inline);
             } else if (link.getType().equals(Constants.get(ConstantKey.ATOM_LINK_FEED))) {
               // inline feed
-              final EntitySet inline = atomDeserializer.toEntitySet(
+              final EntityCollection inline = atomDeserializer.toEntitySet(
                   xml.expandEntity(entitySetName, entityId, link.getTitle())).getPayload();
               rep.setInlineEntitySet(inline);
             }
@@ -1911,7 +1911,7 @@ public abstract class AbstractServices {
         alink.setRel(Constants.get(ConstantKey.ATOM_LINK_REL) + property.getName());
 
         if (property.isCollection()) {
-          EntitySet inline = new EntitySet();
+          EntityCollection inline = new EntityCollection();
           for (Object value : property.asCollection()) {
             Entity inlineEntity = new Entity();
             inlineEntity.setType(navProperties.get(property.getName()).getType());

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/fit/src/main/java/org/apache/olingo/fit/V4Services.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Services.java b/fit/src/main/java/org/apache/olingo/fit/V4Services.java
index 6c1038d..4a41002 100644
--- a/fit/src/main/java/org/apache/olingo/fit/V4Services.java
+++ b/fit/src/main/java/org/apache/olingo/fit/V4Services.java
@@ -64,7 +64,7 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
@@ -283,7 +283,7 @@ public class V4Services extends AbstractServices {
   }
 
   @Override
-  protected void setInlineCount(final EntitySet entitySet, final String count) {
+  protected void setInlineCount(final EntityCollection entitySet, final String count) {
     if ("true".equals(count)) {
       entitySet.setCount(entitySet.getEntities().size());
     }
@@ -456,14 +456,14 @@ public class V4Services extends AbstractServices {
       if (StringUtils.isBlank(deltatoken)) {
         final InputStream input = (InputStream) getEntitySet(
             uriInfo, accept, "Customers", null, null, format, null, null, null, null).getEntity();
-        final EntitySet entitySet = xml.readEntitySet(acceptType, input);
+        final EntityCollection entitySet = xml.readEntitySet(acceptType, input);
 
         boolean trackChanges = prefer.contains("odata.track-changes");
         if (trackChanges) {
           entitySet.setDeltaLink(URI.create("Customers?$deltatoken=8015"));
         }
 
-        output = xml.writeEntitySet(acceptType, new ResWrap<EntitySet>(
+        output = xml.writeEntitySet(acceptType, new ResWrap<EntityCollection>(
             URI.create(Constants.get(ConstantKey.ODATA_METADATA_PREFIX) + "Customers"),
             null,
             entitySet));
@@ -580,10 +580,10 @@ public class V4Services extends AbstractServices {
               + "ProductDetails(ProductID=6,ProductDetailID=1)").toASCIIString());
       entry.setEditLink(link);
 
-      final EntitySet feed = new EntitySet();
+      final EntityCollection feed = new EntityCollection();
       feed.getEntities().add(entry);
 
-      final ResWrap<EntitySet> container = new ResWrap<EntitySet>(
+      final ResWrap<EntityCollection> container = new ResWrap<EntityCollection>(
           URI.create(Constants.get(ConstantKey.ODATA_METADATA_PREFIX) + "ProductDetail"), null,
           feed);
 
@@ -934,7 +934,7 @@ public class V4Services extends AbstractServices {
       // 3. Update the contained entity set
       final String atomFeedRelativePath = containedPath(entityId, containedEntitySetName).toString();
       final InputStream feedIS = FSManager.instance(version).readFile(atomFeedRelativePath, Accept.ATOM);
-      final ResWrap<EntitySet> feedContainer = atomDeserializer.toEntitySet(feedIS);
+      final ResWrap<EntityCollection> feedContainer = atomDeserializer.toEntitySet(feedIS);
       feedContainer.getPayload().getEntities().add(entry);
 
       final ByteArrayOutputStream content = new ByteArrayOutputStream();
@@ -1050,7 +1050,7 @@ public class V4Services extends AbstractServices {
       // 3. Update the contained entity set
       final String atomFeedRelativePath = containedPath(entityId, containedEntitySetName).toString();
       final InputStream feedIS = FSManager.instance(version).readFile(atomFeedRelativePath, Accept.ATOM);
-      final ResWrap<EntitySet> feedContainer = atomDeserializer.toEntitySet(feedIS);
+      final ResWrap<EntityCollection> feedContainer = atomDeserializer.toEntitySet(feedIS);
       feedContainer.getPayload().getEntities().remove(container.getPayload());
 
       final ByteArrayOutputStream content = new ByteArrayOutputStream();
@@ -1103,7 +1103,7 @@ public class V4Services extends AbstractServices {
       final InputStream feed = FSManager.instance(version).
           readFile(containedPath(entityId, tempContainedESName).toString(), Accept.ATOM);
 
-      final ResWrap<EntitySet> container = atomDeserializer.toEntitySet(feed);
+      final ResWrap<EntityCollection> container = atomDeserializer.toEntitySet(feed);
 
       if (derivedType != null) {
         final List<Entity> nonMatching = new ArrayList<Entity>();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
index 126a0b6..6639f7f 100644
--- a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
+++ b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java
@@ -43,7 +43,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.vfs2.FileObject;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
@@ -507,14 +507,14 @@ public abstract class AbstractUtilities {
     return builder.build();
   }
 
-  public EntitySet readEntitySet(final Accept accept, final InputStream entitySet)
+  public EntityCollection readEntitySet(final Accept accept, final InputStream entitySet)
       throws ODataDeserializerException {
     return (accept == Accept.ATOM || accept == Accept.XML ? atomDeserializer.toEntitySet(entitySet) : jsonDeserializer.
         toEntitySet(entitySet))
         .getPayload();
   }
 
-  public InputStream writeEntitySet(final Accept accept, final ResWrap<EntitySet> container)
+  public InputStream writeEntitySet(final Accept accept, final ResWrap<EntityCollection> container)
       throws ODataSerializerException, IOException {
 
     final StringWriter writer = new StringWriter();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/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 baadf20..e915f3f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
@@ -31,7 +31,7 @@ import org.apache.catalina.LifecycleException;
 import org.apache.commons.io.IOUtils;
 import org.apache.olingo.client.api.ODataClient;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataProperty;
 import org.apache.olingo.commons.api.domain.ODataValue;
@@ -81,7 +81,7 @@ public abstract class AbstractBaseTestITCase {
     }
   }
 
-  protected void debugEntitySet(final EntitySet entitySet, final String message) {
+  protected void debugEntitySet(final EntityCollection entitySet, final String message) {
     if (LOG.isDebugEnabled()) {
       final StringWriter writer = new StringWriter();
       try {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
index b7a65e8..1af92d6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java
@@ -27,7 +27,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.domain.ODataAnnotation;
 import org.apache.olingo.commons.api.domain.ODataEntity;
@@ -240,7 +240,7 @@ public class JSONFormatConformanceTestITCase extends AbstractTestITCase {
             + "  \"@odata.deltaLink\": \"Customers?$expand=Orders&$deltatoken=8015\""
             + "}";
 
-    final ResWrap<EntitySet> entitySet =
+    final ResWrap<EntityCollection> entitySet =
             client.getDeserializer(ODataFormat.JSON).toEntitySet(IOUtils.toInputStream(fromSection45_2));
 
     assertEquals(5, entitySet.getPayload().getCount(), 0);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java
index 289c0cb..6dc57dd 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataBinder.java
@@ -21,7 +21,7 @@ package org.apache.olingo.client.api.serialization;
 import org.apache.olingo.client.api.data.ServiceDocument;
 import org.apache.olingo.commons.api.data.Delta;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
@@ -38,9 +38,9 @@ public interface ODataBinder {
    * Gets a <tt>EntitySet</tt> from the given OData entity set.
    *
    * @param entitySet OData entity set.
-   * @return {@link EntitySet} object.
+   * @return {@link EntityCollection} object.
    */
-  EntitySet getEntitySet(ODataEntitySet entitySet);
+  EntityCollection getEntitySet(ODataEntitySet entitySet);
 
   /**
    * Gets an <tt>Entity</tt> from the given OData entity.
@@ -89,7 +89,7 @@ public interface ODataBinder {
    * @param resource entity set resource.
    * @return {@link org.apache.olingo.commons.api.domain.ODataEntitySet} object.
    */
-  ODataEntitySet getODataEntitySet(ResWrap<EntitySet> resource);
+  ODataEntitySet getODataEntitySet(ResWrap<EntityCollection> resource);
 
   /**
    * Gets <tt>ODataEntity</tt> from the given entity resource.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/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 d552e75..20d75b7 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
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -25,7 +25,7 @@ import org.apache.http.client.HttpClient;
 import org.apache.olingo.client.api.ODataClient;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.domain.ODataEntitySet;
 import org.apache.olingo.commons.api.format.ODataFormat;
@@ -37,7 +37,7 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
  * @param <ES> concrete ODataEntitySet implementation
  */
 public class ODataEntitySetRequestImpl<ES extends ODataEntitySet>
-        extends AbstractODataRetrieveRequest<ES> implements ODataEntitySetRequest<ES> {
+    extends AbstractODataRetrieveRequest<ES> implements ODataEntitySetRequest<ES> {
 
   private ES entitySet = null;
 
@@ -68,7 +68,7 @@ public class ODataEntitySetRequestImpl<ES extends ODataEntitySet>
   protected class ODataEntitySetResponseImpl extends AbstractODataRetrieveResponse {
 
     private ODataEntitySetResponseImpl(final ODataClient odataClient, final HttpClient httpClient,
-            final HttpResponse res) {
+        final HttpResponse res) {
 
       super(odataClient, httpClient, res);
     }
@@ -78,7 +78,8 @@ public class ODataEntitySetRequestImpl<ES extends ODataEntitySet>
     public ES getBody() {
       if (entitySet == null) {
         try {
-          final ResWrap<EntitySet> resource = odataClient.getDeserializer(ODataFormat.fromString(getContentType())).
+          final ResWrap<EntityCollection> resource =
+              odataClient.getDeserializer(ODataFormat.fromString(getContentType())).
                   toEntitySet(getRawResponse());
 
           entitySet = (ES) odataClient.getBinder().getODataEntitySet(resource);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
index cd5003d..32cd726 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java
@@ -32,7 +32,7 @@ import org.apache.olingo.client.core.edm.xml.EdmxImpl;
 import org.apache.olingo.client.core.edm.xml.XMLMetadataImpl;
 import org.apache.olingo.commons.api.data.Delta;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.domain.ODataError;
@@ -71,7 +71,7 @@ public class ClientODataDeserializerImpl implements ClientODataDeserializer {
   }
 
   @Override
-  public ResWrap<EntitySet> toEntitySet(final InputStream input) throws ODataDeserializerException {
+  public ResWrap<EntityCollection> toEntitySet(final InputStream input) throws ODataDeserializerException {
     return deserializer.toEntitySet(input);
   }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/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 54823e0..fc295a0 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,7 +41,7 @@ import org.apache.olingo.commons.api.data.DeletedEntity;
 import org.apache.olingo.commons.api.data.Delta;
 import org.apache.olingo.commons.api.data.DeltaLink;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Linked;
 import org.apache.olingo.commons.api.data.Property;
@@ -192,8 +192,8 @@ public class ODataBinderImpl implements ODataBinder {
   }
 
   @Override
-  public EntitySet getEntitySet(final ODataEntitySet odataEntitySet) {
-    final EntitySet entitySet = new EntitySet();
+  public EntityCollection getEntitySet(final ODataEntitySet odataEntitySet) {
+    final EntityCollection entitySet = new EntityCollection();
 
     entitySet.setCount(odataEntitySet.getCount());
 
@@ -387,7 +387,7 @@ public class ODataBinderImpl implements ODataBinder {
   }
 
   @Override
-  public ODataEntitySet getODataEntitySet(final ResWrap<EntitySet> resource) {
+  public ODataEntitySet getODataEntitySet(final ResWrap<EntityCollection> resource) {
     if (LOG.isDebugEnabled()) {
       final StringWriter writer = new StringWriter();
       try {
@@ -432,7 +432,7 @@ public class ODataBinderImpl implements ODataBinder {
       final String href = link.getHref();
       final String title = link.getTitle();
       final Entity inlineEntity = link.getInlineEntity();
-      final EntitySet inlineEntitySet = link.getInlineEntitySet();
+      final EntityCollection inlineEntitySet = link.getInlineEntitySet();
       if (inlineEntity == null && inlineEntitySet == null) {
         ODataLinkType linkType = null;
         if (edmType instanceof EdmStructuredType) {
@@ -476,10 +476,10 @@ public class ODataBinderImpl implements ODataBinder {
             inlineEntity)));
   }
 
-  private ODataInlineEntitySet createODataInlineEntitySet(final EntitySet inlineEntitySet,
+  private ODataInlineEntitySet createODataInlineEntitySet(final EntityCollection inlineEntitySet,
       final URI uri, final String title, final String metadataETag) {
     return new ODataInlineEntitySet(uri, ODataLinkType.ENTITY_SET_NAVIGATION, title,
-        getODataEntitySet(new ResWrap<EntitySet>(
+        getODataEntitySet(new ResWrap<EntityCollection>(
             inlineEntitySet.getBaseURI() == null ? null : inlineEntitySet.getBaseURI(), metadataETag,
             inlineEntitySet)));
   }
@@ -567,7 +567,7 @@ public class ODataBinderImpl implements ODataBinder {
 
   private ODataLink createLinkFromNavigationProperty(final Property property, final String propertyTypeName) {
     if (property.isCollection()) {
-      EntitySet inlineEntitySet = new EntitySet();
+      EntityCollection inlineEntitySet = new EntityCollection();
       for (final Object inlined : property.asCollection()) {
         Entity inlineEntity = new Entity();
         inlineEntity.setType(propertyTypeName);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java
index 253df78..39b1177 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java
@@ -30,7 +30,7 @@ import org.apache.olingo.client.api.edm.xml.XMLMetadata;
 import org.apache.olingo.client.api.serialization.ODataReader;
 import org.apache.olingo.client.core.edm.ClientEdmProvider;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.domain.ODataEntity;
@@ -98,7 +98,7 @@ public class ODataReaderImpl implements ODataReader {
             reference.cast(new ODataEntitySetIterator<ODataEntitySet, ODataEntity>(
                 client, src, ODataFormat.fromString(format))));
       } else if (ODataEntitySet.class.isAssignableFrom(reference)) {
-        final ResWrap<EntitySet> resource = client.getDeserializer(ODataFormat.fromString(format))
+        final ResWrap<EntityCollection> resource = client.getDeserializer(ODataFormat.fromString(format))
             .toEntitySet(src);
         res = new ResWrap<T>(
             resource.getContextURL(),

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java
index b8282e2..5d5671a 100644
--- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java
+++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
- *
+ * 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
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -20,7 +20,7 @@ package org.apache.olingo.client.core.v4;
 
 import org.apache.olingo.client.api.ODataClient;
 import org.apache.olingo.client.core.AbstractTest;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.domain.ODataEntity;
 import org.apache.olingo.commons.api.domain.ODataEntitySet;
@@ -46,13 +46,14 @@ public class EntitySetTest extends AbstractTest {
   private void read(final ODataFormat format) throws IOException, ODataDeserializerException {
     final InputStream input = getClass().getResourceAsStream("Customers." + getSuffix(format));
     final ODataEntitySet entitySet = getClient().getBinder().getODataEntitySet(
-            getClient().getDeserializer(format).toEntitySet(input));
+        getClient().getDeserializer(format).toEntitySet(input));
     assertNotNull(entitySet);
 
     assertEquals(2, entitySet.getEntities().size());
     assertNull(entitySet.getNext());
 
-    final ODataEntitySet written = getClient().getBinder().getODataEntitySet(new ResWrap<EntitySet>((URI) null, null,
+    final ODataEntitySet written =
+        getClient().getBinder().getODataEntitySet(new ResWrap<EntityCollection>((URI) null, null,
             getClient().getBinder().getEntitySet(entitySet)));
     assertEquals(entitySet, written);
   }
@@ -70,7 +71,7 @@ public class EntitySetTest extends AbstractTest {
   private void ref(final ODataFormat format) throws ODataDeserializerException {
     final InputStream input = getClass().getResourceAsStream("collectionOfEntityReferences." + getSuffix(format));
     final ODataEntitySet entitySet = getClient().getBinder().getODataEntitySet(
-            getClient().getDeserializer(format).toEntitySet(input));
+        getClient().getDeserializer(format).toEntitySet(input));
     assertNotNull(entitySet);
 
     for (ODataEntity entity : entitySet.getEntities()) {
@@ -78,7 +79,8 @@ public class EntitySetTest extends AbstractTest {
     }
     entitySet.setCount(entitySet.getEntities().size());
 
-    final ODataEntitySet written = getClient().getBinder().getODataEntitySet(new ResWrap<EntitySet>((URI) null, null,
+    final ODataEntitySet written =
+        getClient().getBinder().getODataEntitySet(new ResWrap<EntityCollection>((URI) null, null,
             getClient().getBinder().getEntitySet(entitySet)));
     assertEquals(entitySet, written);
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
index 5fe36f7..b87c05f 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Delta.java
@@ -21,7 +21,7 @@ package org.apache.olingo.commons.api.data;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Delta extends EntitySet {
+public class Delta extends EntityCollection {
 
   private final List<DeletedEntity> deletedEntities = new ArrayList<DeletedEntity>();
   private final List<DeltaLink> addedLinks = new ArrayList<DeltaLink>();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
new file mode 100644
index 0000000..0946bea
--- /dev/null
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntityCollection.java
@@ -0,0 +1,97 @@
+/*
+ * 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.data;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+public class EntityCollection extends AbstractODataObject {
+
+  private Integer count;
+
+  private final List<Entity> entities = new ArrayList<Entity>();
+
+  private URI next;
+
+  private URI deltaLink;
+
+  /**
+   * Sets number of entries.
+   * 
+   * @param count number of entries
+   */
+  public void setCount(final Integer count) {
+    this.count = count;
+  }
+
+  /**
+   * Gets number of entries - if it was required.
+   * 
+   * @return number of entries into the entity set.
+   */
+  public Integer getCount() {
+    return count;
+  }
+
+  /**
+   * Gets entities.
+   * 
+   * @return entries.
+   */
+  public List<Entity> getEntities() {
+    return entities;
+  }
+
+  /**
+   * Sets next link.
+   * 
+   * @param next next link.
+   */
+  public void setNext(final URI next) {
+    this.next = next;
+  }
+
+  /**
+   * Gets next link if exists.
+   * 
+   * @return next link if exists; null otherwise.
+   */
+  public URI getNext() {
+    return next;
+  }
+
+  /**
+   * Gets delta link if exists.
+   * 
+   * @return delta link if exists; null otherwise.
+   */
+  public URI getDeltaLink() {
+    return deltaLink;
+  }
+
+  /**
+   * Sets delta link.
+   * 
+   * @param deltaLink delta link.
+   */
+  public void setDeltaLink(final URI deltaLink) {
+    this.deltaLink = deltaLink;
+  }
+}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntitySet.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntitySet.java
deleted file mode 100644
index 8f2cfb7..0000000
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/EntitySet.java
+++ /dev/null
@@ -1,97 +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.data;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EntitySet extends AbstractODataObject {
-
-  private Integer count;
-
-  private final List<Entity> entities = new ArrayList<Entity>();
-
-  private URI next;
-
-  private URI deltaLink;
-
-  /**
-   * Sets number of entries.
-   * 
-   * @param count number of entries
-   */
-  public void setCount(final Integer count) {
-    this.count = count;
-  }
-
-  /**
-   * Gets number of entries - if it was required.
-   * 
-   * @return number of entries into the entity set.
-   */
-  public Integer getCount() {
-    return count;
-  }
-
-  /**
-   * Gets entities.
-   * 
-   * @return entries.
-   */
-  public List<Entity> getEntities() {
-    return entities;
-  }
-
-  /**
-   * Sets next link.
-   * 
-   * @param next next link.
-   */
-  public void setNext(final URI next) {
-    this.next = next;
-  }
-
-  /**
-   * Gets next link if exists.
-   * 
-   * @return next link if exists; null otherwise.
-   */
-  public URI getNext() {
-    return next;
-  }
-
-  /**
-   * Gets delta link if exists.
-   * 
-   * @return delta link if exists; null otherwise.
-   */
-  public URI getDeltaLink() {
-    return deltaLink;
-  }
-
-  /**
-   * Sets delta link.
-   * 
-   * @param deltaLink delta link.
-   */
-  public void setDeltaLink(final URI deltaLink) {
-    this.deltaLink = deltaLink;
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
index dff1069..8278633 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
@@ -29,7 +29,7 @@ public class Link extends Annotatable {
   private String type;
   private String mediaETag;
   private Entity entity;
-  private EntitySet entitySet;
+  private EntityCollection entitySet;
   private String bindingLink;
   private List<String> bindingLinks = new ArrayList<String>();
 
@@ -147,7 +147,7 @@ public class Link extends Annotatable {
    * 
    * @return in-line entity set.
    */
-  public EntitySet getInlineEntitySet() {
+  public EntityCollection getInlineEntitySet() {
     return entitySet;
   }
 
@@ -156,7 +156,7 @@ public class Link extends Annotatable {
    * 
    * @param entitySet entity set.
    */
-  public void setInlineEntitySet(final EntitySet entitySet) {
+  public void setInlineEntitySet(final EntityCollection entitySet) {
     this.entitySet = entitySet;
   }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java
index e3b3759..8e313b1 100755
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java
@@ -19,7 +19,7 @@
 package org.apache.olingo.commons.api.serialization;
 
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.domain.ODataError;
@@ -35,9 +35,9 @@ public interface ODataDeserializer {
    * Gets an entity set object from the given InputStream.
    * 
    * @param input stream to be de-serialized.
-   * @return {@link EntitySet} instance.
+   * @return {@link EntityCollection} instance.
    */
-  ResWrap<EntitySet> toEntitySet(InputStream input) throws ODataDeserializerException;
+  ResWrap<EntityCollection> toEntitySet(InputStream input) throws ODataDeserializerException;
 
   /**
    * Gets an entity object from the given InputStream.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java
index cd5210a..84795bf 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java
@@ -44,7 +44,7 @@ import org.apache.olingo.commons.api.data.DeletedEntity.Reason;
 import org.apache.olingo.commons.api.data.Delta;
 import org.apache.olingo.commons.api.data.DeltaLink;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
@@ -712,7 +712,7 @@ public class AtomDeserializer extends AbstractAtomDealer implements ODataDeseria
     }
   }
 
-  private void count(final XMLEventReader reader, final StartElement start, final EntitySet entitySet)
+  private void count(final XMLEventReader reader, final StartElement start, final EntityCollection entitySet)
       throws XMLStreamException {
 
     boolean foundEndElement = false;
@@ -729,12 +729,12 @@ public class AtomDeserializer extends AbstractAtomDealer implements ODataDeseria
     }
   }
 
-  private EntitySet entitySet(final XMLEventReader reader, final StartElement start)
+  private EntityCollection entitySet(final XMLEventReader reader, final StartElement start)
       throws XMLStreamException, EdmPrimitiveTypeException {
     if (!Constants.QNAME_ATOM_ELEM_FEED.equals(start.getName())) {
       return null;
     }
-    final EntitySet entitySet = new EntitySet();
+    final EntityCollection entitySet = new EntityCollection();
     final Attribute xmlBase = start.getAttributeByName(Constants.QNAME_ATTR_XML_BASE);
     if (xmlBase != null) {
       entitySet.setBaseURI(xmlBase.getValue());
@@ -788,7 +788,7 @@ public class AtomDeserializer extends AbstractAtomDealer implements ODataDeseria
   }
 
   @Override
-  public ResWrap<EntitySet> toEntitySet(final InputStream input) throws ODataDeserializerException {
+  public ResWrap<EntityCollection> toEntitySet(final InputStream input) throws ODataDeserializerException {
     try {
       final XMLEventReader reader = getReader(input);
       final StartElement start = skipBeforeFirstStartElement(reader);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java
index 196a46e..fb187fe 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java
@@ -36,7 +36,7 @@ import org.apache.olingo.commons.api.data.Annotation;
 import org.apache.olingo.commons.api.data.ComplexValue;
 import org.apache.olingo.commons.api.data.ContextURL;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ResWrap;
@@ -393,7 +393,7 @@ public class AtomSerializer extends AbstractAtomDealer implements ODataSerialize
     writer.flush();
   }
 
-  private void entitySet(final XMLStreamWriter writer, final EntitySet entitySet)
+  private void entitySet(final XMLStreamWriter writer, final EntityCollection entitySet)
       throws XMLStreamException, EdmPrimitiveTypeException {
     if (entitySet.getBaseURI() != null) {
       writer.writeAttribute(XMLConstants.XML_NS_URI, Constants.ATTR_XML_BASE, entitySet.getBaseURI().toASCIIString());
@@ -442,7 +442,7 @@ public class AtomSerializer extends AbstractAtomDealer implements ODataSerialize
     }
   }
 
-  private void entitySet(final Writer outWriter, final EntitySet entitySet)
+  private void entitySet(final Writer outWriter, final EntityCollection entitySet)
       throws XMLStreamException, EdmPrimitiveTypeException {
     final XMLStreamWriter writer = FACTORY.createXMLStreamWriter(outWriter);
 
@@ -455,7 +455,7 @@ public class AtomSerializer extends AbstractAtomDealer implements ODataSerialize
     writer.flush();
   }
 
-  private void entitySet(final Writer outWriter, final ResWrap<EntitySet> entitySet)
+  private void entitySet(final Writer outWriter, final ResWrap<EntityCollection> entitySet)
       throws XMLStreamException, EdmPrimitiveTypeException {
     final XMLStreamWriter writer = FACTORY.createXMLStreamWriter(outWriter);
 
@@ -491,8 +491,8 @@ public class AtomSerializer extends AbstractAtomDealer implements ODataSerialize
   @Override
   public <T> void write(final Writer writer, final T obj) throws ODataSerializerException {
     try {
-      if (obj instanceof EntitySet) {
-        entitySet(writer, (EntitySet) obj);
+      if (obj instanceof EntityCollection) {
+        entitySet(writer, (EntityCollection) obj);
       } else if (obj instanceof Entity) {
         entity(writer, (Entity) obj);
       } else if (obj instanceof Property) {
@@ -527,8 +527,8 @@ public class AtomSerializer extends AbstractAtomDealer implements ODataSerialize
     final T obj = container == null ? null : container.getPayload();
 
     try {
-      if (obj instanceof EntitySet) {
-        this.entitySet(writer, (ResWrap<EntitySet>) container);
+      if (obj instanceof EntityCollection) {
+        this.entitySet(writer, (ResWrap<EntityCollection>) container);
       } else if (obj instanceof Entity) {
         entity(writer, (ResWrap<Entity>) container);
       } else if (obj instanceof Property) {
@@ -551,8 +551,8 @@ public class AtomSerializer extends AbstractAtomDealer implements ODataSerialize
     if (container.getContextURL() != null) {
       final ContextURL contextURL = ContextURLParser.parse(container.getContextURL());
       String base = contextURL.getServiceRoot().toASCIIString();
-      if (container.getPayload() instanceof EntitySet) {
-        ((EntitySet) container.getPayload()).setBaseURI(base);
+      if (container.getPayload() instanceof EntityCollection) {
+        ((EntityCollection) container.getPayload()).setBaseURI(base);
       }
       if (container.getPayload() instanceof Entity) {
         ((Entity) container.getPayload()).setBaseURI(base);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java
index 1db725b..34394bb 100755
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java
@@ -36,7 +36,7 @@ import org.apache.olingo.commons.api.data.Annotatable;
 import org.apache.olingo.commons.api.data.Annotation;
 import org.apache.olingo.commons.api.data.ComplexValue;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Linked;
 import org.apache.olingo.commons.api.data.Property;
@@ -106,7 +106,7 @@ public class JsonDeserializer implements ODataDeserializer {
       } else if (inline instanceof ArrayNode) {
         link.setType(ODataLinkType.ENTITY_SET_NAVIGATION.toString());
 
-        final EntitySet entitySet = new EntitySet();
+        final EntityCollection entitySet = new EntityCollection();
         for (final Iterator<JsonNode> entries = inline.elements(); entries.hasNext();) {
           entitySet.getEntities().add(entityDeserializer.doDeserialize(entries.next().traverse(codec)).getPayload());
         }
@@ -381,7 +381,7 @@ public class JsonDeserializer implements ODataDeserializer {
   }
 
   @Override
-  public ResWrap<EntitySet> toEntitySet(final InputStream input) throws ODataDeserializerException {
+  public ResWrap<EntityCollection> toEntitySet(final InputStream input) throws ODataDeserializerException {
     try {
       parser = new JsonFactory(new ObjectMapper()).createParser(input);
       return new JsonEntitySetDeserializer(serverMode).doDeserialize(parser);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetDeserializer.java
index f260369..abf131b 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetDeserializer.java
@@ -26,7 +26,7 @@ import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.commons.api.Constants;
 import org.apache.olingo.commons.api.data.Annotation;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
 
@@ -45,7 +45,7 @@ public class JsonEntitySetDeserializer extends JsonDeserializer {
     super(serverMode);
   }
 
-  protected ResWrap<EntitySet> doDeserialize(final JsonParser parser) throws IOException {
+  protected ResWrap<EntityCollection> doDeserialize(final JsonParser parser) throws IOException {
 
     final ObjectNode tree = (ObjectNode) parser.getCodec().readTree(parser);
 
@@ -53,7 +53,7 @@ public class JsonEntitySetDeserializer extends JsonDeserializer {
       return null;
     }
 
-    final EntitySet entitySet = new EntitySet();
+    final EntityCollection entitySet = new EntityCollection();
 
     URI contextURL;
     if (tree.hasNonNull(Constants.JSON_CONTEXT)) {
@@ -115,6 +115,6 @@ public class JsonEntitySetDeserializer extends JsonDeserializer {
       }
     }
 
-    return new ResWrap<EntitySet>(contextURL, metadataETag, entitySet);
+    return new ResWrap<EntityCollection>(contextURL, metadataETag, entitySet);
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java
index 3c67055..02af3cf 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.commons.api.Constants;
 import org.apache.olingo.commons.api.data.Annotation;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
 
@@ -36,15 +36,15 @@ public class JsonEntitySetSerializer extends JsonSerializer {
     super(serverMode);
   }
 
-  protected void doSerialize(final EntitySet entitySet, final JsonGenerator jgen)
+  protected void doSerialize(final EntityCollection entitySet, final JsonGenerator jgen)
       throws IOException, EdmPrimitiveTypeException {
-    doContainerSerialize(new ResWrap<EntitySet>(null, null, entitySet), jgen);
+    doContainerSerialize(new ResWrap<EntityCollection>(null, null, entitySet), jgen);
   }
 
-  protected void doContainerSerialize(final ResWrap<EntitySet> container, final JsonGenerator jgen)
+  protected void doContainerSerialize(final ResWrap<EntityCollection> container, final JsonGenerator jgen)
       throws IOException, EdmPrimitiveTypeException {
 
-    final EntitySet entitySet = container.getPayload();
+    final EntityCollection entitySet = container.getPayload();
 
     jgen.writeStartObject();
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java
index e749736..0dd8dd4 100755
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java
@@ -33,7 +33,7 @@ import org.apache.olingo.commons.api.data.Annotatable;
 import org.apache.olingo.commons.api.data.Annotation;
 import org.apache.olingo.commons.api.data.ComplexValue;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Linked;
 import org.apache.olingo.commons.api.data.Property;
@@ -81,8 +81,8 @@ public class JsonSerializer implements ODataSerializer {
   public <T> void write(final Writer writer, final T obj) throws ODataSerializerException {
     try {
       final JsonGenerator json = new JsonFactory().createGenerator(writer);
-      if (obj instanceof EntitySet) {
-        new JsonEntitySetSerializer(serverMode).doSerialize((EntitySet) obj, json);
+      if (obj instanceof EntityCollection) {
+        new JsonEntitySetSerializer(serverMode).doSerialize((EntityCollection) obj, json);
       } else if (obj instanceof Entity) {
         new JsonEntitySerializer(serverMode, format).doSerialize((Entity) obj, json);
       } else if (obj instanceof Property) {
@@ -113,8 +113,8 @@ public class JsonSerializer implements ODataSerializer {
     final T obj = container == null ? null : container.getPayload();
     try {
       final JsonGenerator json = new JsonFactory().createGenerator(writer);
-      if (obj instanceof EntitySet) {
-        new JsonEntitySetSerializer(serverMode).doContainerSerialize((ResWrap<EntitySet>) container, json);
+      if (obj instanceof EntityCollection) {
+        new JsonEntitySetSerializer(serverMode).doContainerSerialize((ResWrap<EntityCollection>) container, json);
       } else if (obj instanceof Entity) {
         new JsonEntitySerializer(serverMode).doContainerSerialize((ResWrap<Entity>) container, json);
       } else if (obj instanceof Property) {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java
index 062f46b..2c5087b 100644
--- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java
+++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/serialization/AtomDeserializerTest.java
@@ -26,7 +26,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.junit.Test;
 
@@ -230,7 +230,7 @@ public class AtomDeserializerTest {
     final ResWrap<Entity> entity = deserializer.toEntity(in);
     
     assertNotNull(entity);
-    final EntitySet inlineEntitySet = entity.getPayload().getNavigationLink("Supplier").getInlineEntitySet();
+    final EntityCollection inlineEntitySet = entity.getPayload().getNavigationLink("Supplier").getInlineEntitySet();
     assertNotNull(inlineEntitySet);
     assertEquals(0, inlineEntitySet.getEntities().size());
   }
@@ -321,7 +321,7 @@ public class AtomDeserializerTest {
     final ResWrap<Entity> entity = deserializer.toEntity(in);
     
     assertNotNull(entity);
-    final EntitySet inlineEntitySet = entity.getPayload().getNavigationLink("Supplier").getInlineEntitySet();
+    final EntityCollection inlineEntitySet = entity.getPayload().getNavigationLink("Supplier").getInlineEntitySet();
     assertNotNull(inlineEntitySet);
     assertEquals(1, inlineEntitySet.getEntities().size());
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java
index 3f36939..9fcc3fc 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java
@@ -22,7 +22,7 @@ import java.net.URI;
 import java.util.List;
 
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Parameter;
 import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
 import org.apache.olingo.commons.api.data.Property;
@@ -39,9 +39,9 @@ public interface DeserializerResult {
 
   /**
    * Returns a entity set
-   * @return an {@link EntitySet} or null
+   * @return an {@link EntityCollection} or null
    */
-  EntitySet getEntityCollection();
+  EntityCollection getEntityCollection();
 
   /**
    * Returns the ExpandOptions for serialized entities

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
index f014ad6..5a927ed 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
@@ -21,7 +21,7 @@ package org.apache.olingo.server.api.deserializer;
 import java.io.InputStream;
 
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.edm.EdmAction;
 import org.apache.olingo.commons.api.edm.EdmEntityType;
 import org.apache.olingo.commons.api.edm.EdmProperty;
@@ -43,7 +43,7 @@ public interface ODataDeserializer {
   DeserializerResult entity(InputStream stream, EdmEntityType edmEntityType) throws DeserializerException;
 
   /**
-   * Deserializes an entity collection stream into an {@link EntitySet} object.
+   * Deserializes an entity collection stream into an {@link EntityCollection} object.
    * @param stream
    * @param edmEntityType
    * @return {@link DeserializerResult#getEntityCollection()}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
index 01db1a4..3a2fbe0 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
@@ -21,7 +21,7 @@ package org.apache.olingo.server.api.serializer;
 import java.io.InputStream;
 
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.edm.Edm;
 import org.apache.olingo.commons.api.edm.EdmComplexType;
@@ -64,7 +64,7 @@ public interface ODataSerializer {
    * @param options    options for the serializer
    */
   SerializerResult entityCollection(ServiceMetadata metadata, EdmEntityType entityType,
-      EntitySet entitySet, EntityCollectionSerializerOptions options) throws SerializerException;
+      EntityCollection entitySet, EntityCollectionSerializerOptions options) throws SerializerException;
 
   /**
    * Writes entity data into an InputStream.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/DeserializerResultImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/DeserializerResultImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/DeserializerResultImpl.java
index 84d64ea..1c85f3e 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/DeserializerResultImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/DeserializerResultImpl.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Parameter;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.server.api.deserializer.DeserializerResult;
@@ -31,7 +31,7 @@ import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
 
 public class DeserializerResultImpl implements DeserializerResult {
   private Entity entity;
-  private EntitySet entitySet;
+  private EntityCollection entitySet;
   private ExpandOption expandOption;
   private Property property;
   private List<Parameter> actionParametes;
@@ -45,7 +45,7 @@ public class DeserializerResultImpl implements DeserializerResult {
   }
 
   @Override
-  public EntitySet getEntityCollection() {
+  public EntityCollection getEntityCollection() {
     return entitySet;
   }
 
@@ -75,7 +75,7 @@ public class DeserializerResultImpl implements DeserializerResult {
   
   public static class DeserializerResultBuilder {
     private Entity entity;
-    private EntitySet entitySet;
+    private EntityCollection entitySet;
     private ExpandOption expandOption;
     private Property property;
     private List<Parameter> actionParametes;
@@ -98,7 +98,7 @@ public class DeserializerResultImpl implements DeserializerResult {
       return this;
     }
 
-    public DeserializerResultBuilder entityCollection(final EntitySet entitySet) {
+    public DeserializerResultBuilder entityCollection(final EntityCollection entitySet) {
       this.entitySet = entitySet;
       return this;
     }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
index fa2f6a5..d92ac0c 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
@@ -31,7 +31,7 @@ import java.util.Map.Entry;
 import org.apache.olingo.commons.api.Constants;
 import org.apache.olingo.commons.api.data.ComplexValue;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Parameter;
 import org.apache.olingo.commons.api.data.Property;
@@ -92,9 +92,9 @@ public class ODataJsonDeserializer implements ODataDeserializer {
     }
   }
 
-  private EntitySet consumeEntitySetNode(EdmEntityType edmEntityType, final ObjectNode tree,
+  private EntityCollection consumeEntitySetNode(EdmEntityType edmEntityType, final ObjectNode tree,
       final ExpandTreeBuilder expandBuilder) throws DeserializerException {
-    EntitySet entitySet = new EntitySet();
+    EntityCollection entitySet = new EntityCollection();
 
     // Consume entities
     JsonNode jsonNode = tree.get(Constants.VALUE);
@@ -339,7 +339,7 @@ public class ODataJsonDeserializer implements ODataDeserializer {
             expandBuilder.expand(edmNavigationProperty) : null;
         if (jsonNode.isArray() && edmNavigationProperty.isCollection()) {
           link.setType(ODataLinkType.ENTITY_SET_NAVIGATION.toString());
-          EntitySet inlineEntitySet = new EntitySet();
+          EntityCollection inlineEntitySet = new EntityCollection();
           inlineEntitySet.getEntities().addAll(consumeEntitySetArray(edmNavigationProperty.getType(), jsonNode,
               childExpandBuilder));
           link.setInlineEntitySet(inlineEntitySet);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
index c9944c7..ff7eff2 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
@@ -27,7 +27,7 @@ import org.apache.olingo.commons.api.Constants;
 import org.apache.olingo.commons.api.data.ComplexValue;
 import org.apache.olingo.commons.api.data.ContextURL;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Linked;
 import org.apache.olingo.commons.api.data.Property;
@@ -130,7 +130,7 @@ public class ODataJsonSerializer implements ODataSerializer {
 
   @Override
   public SerializerResult entityCollection(final ServiceMetadata metadata,
-      final EdmEntityType entityType, final EntitySet entitySet,
+      final EdmEntityType entityType, final EntityCollection entitySet,
       final EntityCollectionSerializerOptions options) throws SerializerException {
     CircleStreamBuffer buffer = new CircleStreamBuffer();
     try {
@@ -194,7 +194,7 @@ public class ODataJsonSerializer implements ODataSerializer {
   }
 
   protected void writeEntitySet(final ServiceMetadata metadata, final EdmEntityType entityType,
-      final EntitySet entitySet, final ExpandOption expand, final SelectOption select,
+      final EntityCollection entitySet, final ExpandOption expand, final SelectOption select,
       final boolean onlyReference, final JsonGenerator json) throws IOException,
       SerializerException {
     json.writeStartArray();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerImpl.java
index 6143727..2213c5a 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerImpl.java
@@ -23,7 +23,7 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.edm.Edm;
 import org.apache.olingo.commons.api.edm.EdmComplexType;
@@ -95,7 +95,7 @@ public class ODataXmlSerializerImpl implements ODataSerializer {
 
   @Override
   public SerializerResult entityCollection(final ServiceMetadata metadata,
-      final EdmEntityType entityType, final EntitySet entitySet,
+      final EdmEntityType entityType, final EntityCollection entitySet,
       final EntityCollectionSerializerOptions options) throws SerializerException {
     throw new SerializerException("Entityset serialization not implemented for XML format",
         SerializerException.MessageKeys.NOT_IMPLEMENTED);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
index 06da176..b48d051 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
@@ -31,7 +31,7 @@ import java.util.UUID;
 
 import org.apache.olingo.commons.api.data.ComplexValue;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.data.ValueType;
@@ -41,10 +41,10 @@ public class DataCreator {
 
   private static final UUID GUID = UUID.fromString("01234567-89ab-cdef-0123-456789abcdef");
 
-  private final Map<String, EntitySet> data;
+  private final Map<String, EntityCollection> data;
 
   public DataCreator() {
-    data = new HashMap<String, EntitySet>();
+    data = new HashMap<String, EntityCollection>();
     data.put("ESTwoPrim", createESTwoPrim());
     data.put("ESAllPrim", createESAllPrim());
     data.put("ESCompAllPrim", createESCompAllPrim());
@@ -59,19 +59,19 @@ public class DataCreator {
     data.put("ESServerSidePaging", createESServerSidePaging());
 
     // No data available but to allow an insert operation create empty EntitySets
-    data.put("ESAllNullable", new EntitySet());
-    data.put("ESMixEnumDefCollComp", new EntitySet());
-    data.put("ESTwoBase", new EntitySet());
-    data.put("ESBaseTwoKeyNav", new EntitySet());
-    data.put("ESBaseTwoKeyTwoPrim", new EntitySet());
-    data.put("ESTwoKeyTwoPrim", new EntitySet());
-    data.put("ESCompCollAllPrim", new EntitySet());
-    data.put("ESKeyTwoKeyComp", new EntitySet());
-    data.put("ESFourKeyAlias", new EntitySet());
-    data.put("ESBase", new EntitySet());
-    data.put("ESTwoBaseTwoKeyTwoPrim", new EntitySet());
-    data.put("ESInvisible", new EntitySet());
-    data.put("ESCompMixPrimCollComp", new EntitySet());
+    data.put("ESAllNullable", new EntityCollection());
+    data.put("ESMixEnumDefCollComp", new EntityCollection());
+    data.put("ESTwoBase", new EntityCollection());
+    data.put("ESBaseTwoKeyNav", new EntityCollection());
+    data.put("ESBaseTwoKeyTwoPrim", new EntityCollection());
+    data.put("ESTwoKeyTwoPrim", new EntityCollection());
+    data.put("ESCompCollAllPrim", new EntityCollection());
+    data.put("ESKeyTwoKeyComp", new EntityCollection());
+    data.put("ESFourKeyAlias", new EntityCollection());
+    data.put("ESBase", new EntityCollection());
+    data.put("ESTwoBaseTwoKeyTwoPrim", new EntityCollection());
+    data.put("ESInvisible", new EntityCollection());
+    data.put("ESCompMixPrimCollComp", new EntityCollection());
 
     linkESTwoPrim(data);
     linkESAllPrim(data);
@@ -79,12 +79,12 @@ public class DataCreator {
     linkESTwoKeyNav(data);
   }
 
-  protected Map<String, EntitySet> getData() {
+  protected Map<String, EntityCollection> getData() {
     return data;
   }
 
-  private EntitySet createESServerSidePaging() {
-    EntitySet entitySet = new EntitySet();
+  private EntityCollection createESServerSidePaging() {
+    EntityCollection entitySet = new EntityCollection();
 
     for (int i = 1; i <= 503; i++) {
       entitySet.getEntities().add(new Entity().addProperty(createPrimitive("PropertyInt16", i))
@@ -94,8 +94,8 @@ public class DataCreator {
     return entitySet;
   }
 
-  private EntitySet createESKeyNav() {
-    final EntitySet entitySet = new EntitySet();
+  private EntityCollection createESKeyNav() {
+    final EntityCollection entitySet = new EntityCollection();
 
     entitySet.getEntities().add(createETKeyNavEntity(1, "I am String Property 1"));
     entitySet.getEntities().add(createETKeyNavEntity(2, "I am String Property 2"));
@@ -123,8 +123,8 @@ public class DataCreator {
             createComplex("PropertyCompNav", createPrimitive("PropertyInt16", 1))));
   }
 
-  private EntitySet createESTwoKeyNav() {
-    final EntitySet entitySet = new EntitySet();
+  private EntityCollection createESTwoKeyNav() {
+    final EntityCollection entitySet = new EntityCollection();
 
     entitySet.getEntities().add(createESTwoKeyNavEntity(1, "1"));
     entitySet.getEntities().add(createESTwoKeyNavEntity(1, "2"));
@@ -174,8 +174,8 @@ public class DataCreator {
   }
 
   @SuppressWarnings("unchecked")
-  private EntitySet createESCompCollComp() {
-    final EntitySet entitySet = new EntitySet();
+  private EntityCollection createESCompCollComp() {
+    final EntityCollection entitySet = new EntityCollection();
 
     entitySet.getEntities().add(new Entity().addProperty(createPrimitive("PropertyInt16", Short.MAX_VALUE))
         .addProperty(createComplex("PropertyComp", createComplexCollection("CollPropertyComp", Arrays
@@ -198,8 +198,8 @@ public class DataCreator {
     return entitySet;
   }
 
-  private EntitySet createESTwoPrim() {
-    EntitySet entitySet = new EntitySet();
+  private EntityCollection createESTwoPrim() {
+    EntityCollection entitySet = new EntityCollection();
 
     entitySet.getEntities().add(new Entity().addProperty(createPrimitive("PropertyInt16", 32766))
         .addProperty(createPrimitive("PropertyString", "Test String1")));
@@ -216,8 +216,8 @@ public class DataCreator {
     return entitySet;
   }
 
-  private EntitySet createESAllPrim() {
-    EntitySet entitySet = new EntitySet();
+  private EntityCollection createESAllPrim() {
+    EntityCollection entitySet = new EntityCollection();
 
     entitySet.getEntities().add(new Entity().addProperty(createPrimitive("PropertyInt16", Short.MAX_VALUE))
         .addProperty(createPrimitive("PropertyString", "First Resource - positive values"))
@@ -266,8 +266,8 @@ public class DataCreator {
     return entitySet;
   }
 
-  private EntitySet createESCompAllPrim() {
-    EntitySet entitySet = new EntitySet();
+  private EntityCollection createESCompAllPrim() {
+    EntityCollection entitySet = new EntityCollection();
 
     Entity entity = new Entity();
     entity.addProperty(createPrimitive("PropertyInt16", Short.MAX_VALUE));
@@ -318,8 +318,8 @@ public class DataCreator {
     return entitySet;
   }
 
-  private EntitySet createESCollAllPrim() {
-    EntitySet entitySet = new EntitySet();
+  private EntityCollection createESCollAllPrim() {
+    EntityCollection entitySet = new EntityCollection();
 
     entitySet.getEntities().add(new Entity().addProperty(createPrimitive("PropertyInt16", 1)).addProperty(
         createPrimitiveCollection("CollPropertyString", "Employee1@company.example", "Employee2@company.example",
@@ -361,13 +361,13 @@ public class DataCreator {
     return entitySet;
   }
 
-  private EntitySet createESMixPrimCollComp() {
+  private EntityCollection createESMixPrimCollComp() {
     @SuppressWarnings("unchecked") final Property complexCollection = createComplexCollection("CollPropertyComp",
         Arrays.asList(createPrimitive("PropertyInt16", 123), createPrimitive("PropertyString", "TEST 1")),
         Arrays.asList(createPrimitive("PropertyInt16", 456), createPrimitive("PropertyString", "TEST 2")),
         Arrays.asList(createPrimitive("PropertyInt16", 789), createPrimitive("PropertyString", "TEST 3")));
 
-    EntitySet entitySet = new EntitySet();
+    EntityCollection entitySet = new EntityCollection();
 
     entitySet.getEntities().add(new Entity().addProperty(createPrimitive("PropertyInt16", Short.MAX_VALUE))
         .addProperty(
@@ -391,8 +391,8 @@ public class DataCreator {
     return entitySet;
   }
 
-  private EntitySet createESAllKey() {
-    EntitySet entitySet = new EntitySet();
+  private EntityCollection createESAllKey() {
+    EntityCollection entitySet = new EntityCollection();
 
     entitySet.getEntities().add(new Entity().addProperty(createPrimitive("PropertyString", "First"))
         .addProperty(createPrimitive("PropertyBoolean", true)).addProperty(createPrimitive("PropertyByte", 255))
@@ -420,8 +420,8 @@ public class DataCreator {
     return entitySet;
   }
 
-  private EntitySet createESCompComp() {
-    EntitySet entitySet = new EntitySet();
+  private EntityCollection createESCompComp() {
+    EntityCollection entitySet = new EntityCollection();
 
     Entity entity = new Entity();
     entity.addProperty(createPrimitive("PropertyInt16", 1));
@@ -440,8 +440,8 @@ public class DataCreator {
     return entitySet;
   }
 
-  private EntitySet createESMedia() {
-    EntitySet entitySet = new EntitySet();
+  private EntityCollection createESMedia() {
+    EntityCollection entitySet = new EntityCollection();
 
     Entity entity = new Entity().addProperty(createPrimitive("PropertyInt16", 1))
         .addProperty(createPrimitive(DataProvider.MEDIA_PROPERTY_NAME, createImage("darkturquoise")));
@@ -473,8 +473,8 @@ public class DataCreator {
         + "    <circle cx=\"50\" cy=\"50\" r=\"42\"/>\n" + "  </g>\n" + "</svg>\n").getBytes(Charset.forName("UTF-8"));
   }
 
-  private void linkESTwoPrim(Map<String, EntitySet> data) {
-    final EntitySet entitySet = data.get("ESTwoPrim");
+  private void linkESTwoPrim(Map<String, EntityCollection> data) {
+    final EntityCollection entitySet = data.get("ESTwoPrim");
     final List<Entity> targetEntities = data.get("ESAllPrim").getEntities();
 
     setLinks(entitySet.getEntities().get(1), "NavPropertyETAllPrimMany", targetEntities.get(1), targetEntities.get(2));
@@ -482,8 +482,8 @@ public class DataCreator {
     setLink(entitySet.getEntities().get(3), "NavPropertyETAllPrimOne", targetEntities.get(0));
   }
 
-  private void linkESAllPrim(Map<String, EntitySet> data) {
-    final EntitySet entitySet = data.get("ESAllPrim");
+  private void linkESAllPrim(Map<String, EntityCollection> data) {
+    final EntityCollection entitySet = data.get("ESAllPrim");
     final List<Entity> targetEntities = data.get("ESTwoPrim").getEntities();
 
     setLinks(entitySet.getEntities().get(0), "NavPropertyETTwoPrimMany", targetEntities.get(1));
@@ -493,8 +493,8 @@ public class DataCreator {
         targetEntities.get(3));
   }
 
-  private void linkESKeyNav(Map<String, EntitySet> data) {
-    final EntitySet entitySet = data.get("ESKeyNav");
+  private void linkESKeyNav(Map<String, EntityCollection> data) {
+    final EntityCollection entitySet = data.get("ESKeyNav");
     final List<Entity> esKeyNavTargets = data.get("ESKeyNav").getEntities();
     final List<Entity> esTwoKeyNavTargets = data.get("ESTwoKeyNav").getEntities();
     final List<Entity> esMediaTargets = data.get("ESMedia").getEntities();
@@ -524,8 +524,8 @@ public class DataCreator {
     setLink(entitySet.getEntities().get(2), "NavPropertyETMediaOne", esMediaTargets.get(2));
   }
 
-  private void linkESTwoKeyNav(Map<String, EntitySet> data) {
-    final EntitySet entitySet = data.get("ESTwoKeyNav");
+  private void linkESTwoKeyNav(Map<String, EntityCollection> data) {
+    final EntityCollection entitySet = data.get("ESTwoKeyNav");
     final List<Entity> esKeyNavTargets = data.get("ESKeyNav").getEntities();
     final List<Entity> esTwoKeyNavTargets = data.get("ESTwoKeyNav").getEntities();
 
@@ -619,7 +619,7 @@ public class DataCreator {
       link = new Link();
       link.setType(ODataLinkType.ENTITY_SET_NAVIGATION.toString());
       link.setTitle(navigationPropertyName);
-      EntitySet target = new EntitySet();
+      EntityCollection target = new EntityCollection();
       target.getEntities().addAll(Arrays.asList(targets));
       link.setInlineEntitySet(target);
       entity.getNavigationLinks().add(link);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
index a203750..6bf79fa 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
@@ -29,7 +29,7 @@ import java.util.Map;
 
 import org.apache.olingo.commons.api.data.ComplexValue;
 import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
+import org.apache.olingo.commons.api.data.EntityCollection;
 import org.apache.olingo.commons.api.data.Link;
 import org.apache.olingo.commons.api.data.Property;
 import org.apache.olingo.commons.api.edm.Edm;
@@ -55,7 +55,7 @@ public class DataProvider {
 
   protected static final String MEDIA_PROPERTY_NAME = "$value";
 
-  final private Map<String, EntitySet> data;
+  final private Map<String, EntityCollection> data;
   private Edm edm;
   private OData odata;
 
@@ -63,16 +63,16 @@ public class DataProvider {
     data = new DataCreator().getData();
   }
 
-  public EntitySet readAll(final EdmEntitySet edmEntitySet) throws DataProviderException {
+  public EntityCollection readAll(final EdmEntitySet edmEntitySet) throws DataProviderException {
     return data.get(edmEntitySet.getName());
   }
 
   public Entity read(final EdmEntitySet edmEntitySet, final List<UriParameter> keys) throws DataProviderException {
-    final EntitySet entitySet = readAll(edmEntitySet);
+    final EntityCollection entitySet = readAll(edmEntitySet);
     return entitySet == null ? null : read(edmEntitySet.getEntityType(), entitySet, keys);
   }
 
-  public Entity read(final EdmEntityType edmEntityType, final EntitySet entitySet, final List<UriParameter> keys)
+  public Entity read(final EdmEntityType edmEntityType, final EntityCollection entitySet, final List<UriParameter> keys)
       throws DataProviderException {
     try {
       for (final Entity entity : entitySet.getEntities()) {
@@ -129,7 +129,7 @@ public class DataProvider {
 
   public Entity create(final EdmEntitySet edmEntitySet) throws DataProviderException {
     final EdmEntityType edmEntityType = edmEntitySet.getEntityType();
-    final EntitySet entitySet = readAll(edmEntitySet);
+    final EntityCollection entitySet = readAll(edmEntitySet);
     final List<Entity> entities = entitySet.getEntities();
     final Map<String, Object> newKey = findFreeComposedKey(entities, edmEntitySet.getEntityType());
     final Entity newEntity = new Entity();
@@ -349,7 +349,7 @@ public class DataProvider {
   }
 
   private List<Entity> createInlineEntities(final String rawBaseUri, final EdmEntitySet targetEntitySet,
-      final EntitySet changedEntitySet) throws DataProviderException {
+      final EntityCollection changedEntitySet) throws DataProviderException {
     List<Entity> entities = new ArrayList<Entity>();
 
     for (final Entity newEntity : changedEntitySet.getEntities()) {
@@ -473,7 +473,7 @@ public class DataProvider {
     entity.setMediaContentType(type);
   }
 
-  public EntitySet readFunctionEntitySet(final EdmFunction function, final List<UriParameter> parameters)
+  public EntityCollection readFunctionEntitySet(final EdmFunction function, final List<UriParameter> parameters)
       throws DataProviderException {
     return FunctionData.entityCollectionFunction(function.getName(), parameters, data);
   }


Mime
View raw message