Repository: olingo-odata4 Updated Branches: refs/heads/master 05935a0c3 -> d692d129b
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java index 1028cd8..7e126a0 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/FunctionData.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; 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.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; @@ -33,11 +33,11 @@ import org.apache.olingo.server.tecsvc.data.DataProvider.DataProviderException; public class FunctionData { - protected static EntitySet entityCollectionFunction(final String name, final List<UriParameter> parameters, - final Map<String, EntitySet> data) throws DataProviderException { + protected static EntityCollection entityCollectionFunction(final String name, final List<UriParameter> parameters, + final Map<String, EntityCollection> data) throws DataProviderException { if (name.equals("UFCRTCollETTwoKeyNavParam")) { final List<Entity> esTwoKeyNav = data.get("ESTwoKeyNav").getEntities(); - EntitySet result = new EntitySet(); + EntityCollection result = new EntityCollection(); final int endIndex = parameters.isEmpty() ? 0 : Short.valueOf(parameters.get(0).getText()); result.getEntities().addAll( esTwoKeyNav.subList(0, @@ -53,7 +53,7 @@ public class FunctionData { } protected static Entity entityFunction(final String name, final List<UriParameter> parameters, - final Map<String, EntitySet> data) throws DataProviderException { + final Map<String, EntityCollection> data) throws DataProviderException { final List<Entity> esTwoKeyNav = data.get("ESTwoKeyNav").getEntities(); if (name.equals("UFCRTETTwoKeyNav")) { return esTwoKeyNav.get(0); @@ -71,7 +71,7 @@ public class FunctionData { @SuppressWarnings("unchecked") protected static Property primitiveComplexFunction(final String name, final List<UriParameter> parameters, - final Map<String, EntitySet> data) throws DataProviderException { + final Map<String, EntityCollection> data) throws DataProviderException { if (name.equals("UFNRTInt16")) { return DataCreator.createPrimitive(name, 12345); } else if (name.equals("UFCRTString")) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java index 113b252..c2e9da4 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/RequestValidator.java @@ -23,7 +23,7 @@ import java.util.List; 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; @@ -140,7 +140,7 @@ public class RequestValidator { } if(edmProperty.isCollection()) { - final EntitySet inlineEntitySet = navigationLink.getInlineEntitySet(); + final EntityCollection inlineEntitySet = navigationLink.getInlineEntitySet(); if(!isInsert && inlineEntitySet.getEntities().size() > 0) { throw new DataProvider.DataProviderException("Deep update is not allowed", HttpStatusCode.BAD_REQUEST); } else { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java index 858963d..01f2c90 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java @@ -24,7 +24,7 @@ import org.apache.olingo.commons.api.data.ContextURL; import org.apache.olingo.commons.api.data.ContextURL.Builder; import org.apache.olingo.commons.api.data.ContextURL.Suffix; 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.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -91,13 +91,13 @@ public class TechnicalEntityProcessor extends TechnicalProcessor .get(uriInfo.getUriResourceParts().size() - 1)).getType() : edmEntitySet.getEntityType(); - final EntitySet entitySetInitial = readEntityCollection(uriInfo); + final EntityCollection entitySetInitial = readEntityCollection(uriInfo); if (entitySetInitial == null) { throw new ODataApplicationException("Nothing found.", HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ROOT); } else { // Modifying the original entitySet means modifying the "database", so we have to make a shallow // copy of the entity set (new EntitySet, but exactly the same data) - EntitySet entitySet = new EntitySet(); + EntityCollection entitySet = new EntityCollection(); entitySet.getEntities().addAll(entitySetInitial.getEntities()); // Apply system query options @@ -121,7 +121,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor // Create a shallow copy of each entity. So the expanded navigation properties can be modified for serialization, // without affecting the data stored in the database. final ExpandSystemQueryOptionHandler expandHandler = new ExpandSystemQueryOptionHandler(); - final EntitySet entitySetSerialization = expandHandler.transformEntitySetGraphToTree(entitySet, + final EntityCollection entitySetSerialization = expandHandler.transformEntitySetGraphToTree(entitySet, edmEntitySet, expand); expandHandler.applyExpandQueryOptions(entitySetSerialization, edmEntitySet, expand); @@ -155,7 +155,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor throws ODataApplicationException, SerializerException { validateOptions(uriInfo.asUriInfoResource()); getEdmEntitySet(uriInfo); // including checks - EntitySet entitySet = readEntityCollection(uriInfo); + EntityCollection entitySet = readEntityCollection(uriInfo); if (entitySet == null) { throw new ODataApplicationException("Nothing found.", HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ROOT); } else { @@ -330,7 +330,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode()); } - private void setCount(EntitySet entitySet) { + private void setCount(EntityCollection entitySet) { if (entitySet.getCount() == null) { entitySet.setCount(entitySet.getEntities().size()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java index 33cd98f..d826b19 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Locale; 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.edm.EdmBindingTarget; import org.apache.olingo.commons.api.edm.EdmEntitySet; @@ -163,7 +163,7 @@ public abstract class TechnicalProcessor implements Processor { return entity; } - protected EntitySet readEntityCollection(final UriInfoResource uriInfo) throws ODataApplicationException { + protected EntityCollection readEntityCollection(final UriInfoResource uriInfo) throws ODataApplicationException { final List<UriResource> resourcePaths = uriInfo.getUriResourceParts(); if (resourcePaths.size() > 1 && resourcePaths.get(1) instanceof UriResourceNavigation) { final Entity entity = readEntity(uriInfo); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java index e6b9849..f68af3b 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/ExpandSystemQueryOptionHandler.java @@ -24,7 +24,7 @@ import java.util.Locale; import java.util.Set; 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.edm.EdmBindingTarget; import org.apache.olingo.commons.api.edm.EdmEntitySet; @@ -48,7 +48,7 @@ import org.apache.olingo.server.tecsvc.processor.queryoptions.options.TopHandler public class ExpandSystemQueryOptionHandler { - public void applyExpandQueryOptions(final EntitySet entitySet, final EdmEntitySet edmEntitySet, + public void applyExpandQueryOptions(final EntityCollection entitySet, final EdmEntitySet edmEntitySet, final ExpandOption expandOption) throws ODataApplicationException { if (expandOption == null) { return; @@ -80,14 +80,14 @@ public class ExpandSystemQueryOptionHandler { final Link link = entity.getNavigationLink(navPropertyName); if (link != null && entityType.getNavigationProperty(navPropertyName).isCollection()) { - applyOptionsToEntityCollection(link.getInlineEntitySet(), - targetEdmEntitySet, - item.getFilterOption(), - item.getOrderByOption(), - item.getCountOption(), - item.getSkipOption(), - item.getTopOption(), - item.getExpandOption()); + applyOptionsToEntityCollection(link.getInlineEntitySet(), + targetEdmEntitySet, + item.getFilterOption(), + item.getOrderByOption(), + item.getCountOption(), + item.getSkipOption(), + item.getTopOption(), + item.getExpandOption()); } } else { throw new ODataApplicationException("Not supported resource part in expand system query option", @@ -96,83 +96,84 @@ public class ExpandSystemQueryOptionHandler { } } - private void applyOptionsToEntityCollection(final EntitySet entitySet, final EdmBindingTarget edmBindingTarget, + private void applyOptionsToEntityCollection(final EntityCollection entitySet, + final EdmBindingTarget edmBindingTarget, final FilterOption filterOption, final OrderByOption orderByOption, final CountOption countOption, - final SkipOption skipOption, final TopOption topOption, final ExpandOption expandOption) - throws ODataApplicationException { + final SkipOption skipOption, final TopOption topOption, final ExpandOption expandOption) + throws ODataApplicationException { FilterHandler.applyFilterSystemQuery(filterOption, entitySet, edmBindingTarget); OrderByHandler.applyOrderByOption(orderByOption, entitySet, edmBindingTarget); // TODO Add CountHandler SkipHandler.applySkipSystemQueryHandler(skipOption, entitySet); TopHandler.applyTopSystemQueryOption(topOption, entitySet); - + // Apply nested expand system query options to remaining entities - if(expandOption != null) { - for(final Entity entity : entitySet.getEntities()) { + if (expandOption != null) { + for (final Entity entity : entitySet.getEntities()) { applyExpandOptionToEntity(entity, edmBindingTarget, expandOption); } } } - public EntitySet transformEntitySetGraphToTree(final EntitySet entitySet, final EdmBindingTarget edmBindingTarget, - final ExpandOption expand) throws ODataApplicationException { - - final EntitySet newEntitySet = newEntitySet(entitySet); - - for(final Entity entity : entitySet.getEntities()) { + public EntityCollection transformEntitySetGraphToTree(final EntityCollection entitySet, + final EdmBindingTarget edmBindingTarget, final ExpandOption expand) throws ODataApplicationException { + + final EntityCollection newEntitySet = newEntitySet(entitySet); + + for (final Entity entity : entitySet.getEntities()) { newEntitySet.getEntities().add(transformEntityGraphToTree(entity, edmBindingTarget, expand)); } - + return newEntitySet; } - - public Entity transformEntityGraphToTree(final Entity entity, EdmBindingTarget edmEntitySet, + + public Entity transformEntityGraphToTree(final Entity entity, EdmBindingTarget edmEntitySet, final ExpandOption expand) throws ODataApplicationException { final Entity newEntity = newEntity(entity); if (hasExpandItems(expand)) { final boolean expandAll = expandAll(expand); final Set<String> expanded = expandAll ? null : getExpandedPropertyNames(expand.getExpandItems()); final EdmEntityType edmType = edmEntitySet.getEntityType(); - + for (final Link link : entity.getNavigationLinks()) { final String propertyName = link.getTitle(); - + if (expandAll || expanded.contains(propertyName)) { final EdmNavigationProperty edmNavigationProperty = edmType.getNavigationProperty(propertyName); final EdmBindingTarget edmBindingTarget = edmEntitySet.getRelatedBindingTarget(propertyName); final Link newLink = newLink(link); newEntity.getNavigationLinks().add(newLink); final ExpandOption innerExpandOption = getInnerExpandOption(expand, propertyName); - - if(edmNavigationProperty.isCollection()) { - newLink.setInlineEntitySet(transformEntitySetGraphToTree(link.getInlineEntitySet(), - edmBindingTarget, - innerExpandOption)); + + if (edmNavigationProperty.isCollection()) { + newLink.setInlineEntitySet(transformEntitySetGraphToTree(link.getInlineEntitySet(), + edmBindingTarget, + innerExpandOption)); } else { - newLink.setInlineEntity(transformEntityGraphToTree(link.getInlineEntity(), - edmBindingTarget, - innerExpandOption)); + newLink.setInlineEntity(transformEntityGraphToTree(link.getInlineEntity(), + edmBindingTarget, + innerExpandOption)); } } } - + } return newEntity; } - - public EntitySet newEntitySet(final EntitySet entitySet) { - final EntitySet newEntitySet = new EntitySet(); + + public EntityCollection newEntitySet(final EntityCollection entitySet) { + final EntityCollection newEntitySet = new EntityCollection(); newEntitySet.setCount(entitySet.getCount()); newEntitySet.setDeltaLink(entitySet.getDeltaLink()); newEntitySet.setNext(entitySet.getNext()); - + return newEntitySet; } - + private Entity newEntity(final Entity entity) { final Entity newEntity = new Entity(); - + newEntity.getProperties().addAll(entity.getProperties()); newEntity.getAnnotations().addAll(entity.getAnnotations()); newEntity.getAssociationLinks().addAll(entity.getAssociationLinks()); @@ -185,24 +186,24 @@ public class ExpandSystemQueryOptionHandler { newEntity.setSelfLink(entity.getSelfLink()); newEntity.setType(entity.getType()); newEntity.getNavigationBindings().addAll(entity.getNavigationBindings()); - + return newEntity; } - + private Link newLink(Link link) { final Link newLink = new Link(); newLink.setMediaETag(link.getMediaETag()); newLink.setTitle(link.getTitle()); newLink.setType(link.getType()); newLink.setRel(link.getRel()); - + return newLink; } - + private boolean hasExpandItems(ExpandOption expand) { return expand != null && expand.getExpandItems() != null && !expand.getExpandItems().isEmpty(); } - + private boolean expandAll(ExpandOption expand) { for (final ExpandItem item : expand.getExpandItems()) { if (item.isStar()) { @@ -211,7 +212,7 @@ public class ExpandSystemQueryOptionHandler { } return false; } - + private Set<String> getExpandedPropertyNames(List<ExpandItem> expandItems) throws ODataApplicationException { Set<String> expanded = new HashSet<String>(); for (final ExpandItem item : expandItems) { @@ -230,14 +231,14 @@ public class ExpandSystemQueryOptionHandler { } private ExpandOption getInnerExpandOption(final ExpandOption expand, final String propertyName) { - for(final ExpandItem item : expand.getExpandItems()) { + for (final ExpandItem item : expand.getExpandItems()) { final UriResource resource = item.getResourcePath().getUriResourceParts().get(0); - if(resource instanceof UriResourceNavigation + if (resource instanceof UriResourceNavigation && propertyName.equals(((UriResourceNavigation) resource).getProperty().getName())) { return item.getExpandOption(); } } - + return null; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/CountHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/CountHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/CountHandler.java index 59f6a4e..cfe79ec 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/CountHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/CountHandler.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.server.tecsvc.processor.queryoptions.options; -import org.apache.olingo.commons.api.data.EntitySet; +import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.server.api.uri.queryoption.CountOption; public class CountHandler { - public static void applyCountSystemQueryOption(final CountOption countOption, final EntitySet entitySet) { + public static void applyCountSystemQueryOption(final CountOption countOption, final EntityCollection entitySet) { if(countOption != null && countOption.getValue()) { entitySet.setCount(entitySet.getEntities().size()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/FilterHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/FilterHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/FilterHandler.java index 69fa2e4..3db6b98 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/FilterHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/FilterHandler.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.Locale; 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.EdmBindingTarget; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; @@ -45,7 +45,7 @@ public class FilterHandler { primBoolean = oData.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Boolean); } - public static void applyFilterSystemQuery(FilterOption filterOption, EntitySet entitySet, + public static void applyFilterSystemQuery(FilterOption filterOption, EntityCollection entitySet, EdmBindingTarget edmEntitySet) throws ODataApplicationException { if (filterOption == null) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/OrderByHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/OrderByHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/OrderByHandler.java index d166c4e..ce472ba 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/OrderByHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/OrderByHandler.java @@ -23,7 +23,7 @@ import java.util.Comparator; import java.util.Locale; 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.EdmBindingTarget; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.server.api.ODataApplicationException; @@ -34,7 +34,7 @@ import org.apache.olingo.server.tecsvc.processor.queryoptions.expression.Express import org.apache.olingo.server.tecsvc.processor.queryoptions.expression.operand.TypedOperand; public class OrderByHandler { - public static void applyOrderByOption(final OrderByOption orderByOption, final EntitySet entitySet, + public static void applyOrderByOption(final OrderByOption orderByOption, final EntityCollection entitySet, final EdmBindingTarget edmBindingTarget) throws ODataApplicationException { if (orderByOption == null) { @@ -54,7 +54,7 @@ public class OrderByHandler { } } - private static void applyOrderByOptionInternal(final OrderByOption orderByOption, final EntitySet entitySet, + private static void applyOrderByOptionInternal(final OrderByOption orderByOption, final EntityCollection entitySet, final EdmBindingTarget edmBindingTarget) throws ODataApplicationException { Collections.sort(entitySet.getEntities(), new Comparator<Entity>() { @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/ServerSidePagingHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/ServerSidePagingHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/ServerSidePagingHandler.java index a945edb..0871a33 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/ServerSidePagingHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/ServerSidePagingHandler.java @@ -22,7 +22,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Locale; -import org.apache.olingo.commons.api.data.EntitySet; +import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.server.api.ODataApplicationException; @@ -34,7 +34,7 @@ public class ServerSidePagingHandler { private static final int MAX_PAGE_SIZE = 10; private static final String ES_SERVER_SIDE_PAGING = "ESServerSidePaging"; - public static void applyServerSidePaging(final SkipTokenOption skipTokenOption, final EntitySet entitySet, + public static void applyServerSidePaging(final SkipTokenOption skipTokenOption, final EntityCollection entitySet, final EdmEntitySet edmEntitySet, final String rawRequestUri) throws ODataApplicationException { if (edmEntitySet != null && shouldApplyServerSidePaging(edmEntitySet)) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SkipHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SkipHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SkipHandler.java index 48414ea..835657b 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SkipHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/SkipHandler.java @@ -22,13 +22,13 @@ import java.util.Iterator; import java.util.Locale; 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.http.HttpStatusCode; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.uri.queryoption.SkipOption; public class SkipHandler { - public static void applySkipSystemQueryHandler(final SkipOption skipOption, final EntitySet entitySet) + public static void applySkipSystemQueryHandler(final SkipOption skipOption, final EntityCollection entitySet) throws ODataApplicationException { if (skipOption != null) { @@ -41,7 +41,7 @@ public class SkipHandler { } } - static void popAtMost(final EntitySet entitySet, final int n) { + static void popAtMost(final EntityCollection entitySet, final int n) { final Iterator<Entity> iter = entitySet.getEntities().iterator(); int i = 0; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/TopHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/TopHandler.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/TopHandler.java index 7edc105..3177f44 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/TopHandler.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/options/TopHandler.java @@ -20,13 +20,13 @@ package org.apache.olingo.server.tecsvc.processor.queryoptions.options; import java.util.Locale; -import org.apache.olingo.commons.api.data.EntitySet; +import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.uri.queryoption.TopOption; public class TopHandler { - public static void applyTopSystemQueryOption(final TopOption topOption, final EntitySet entitySet) + public static void applyTopSystemQueryOption(final TopOption topOption, final EntityCollection entitySet) throws ODataApplicationException { if (topOption != null) { @@ -39,7 +39,7 @@ public class TopHandler { } } - static void reduceToSize(final EntitySet entitySet, final int n) { + static void reduceToSize(final EntityCollection entitySet, final int n) { while (entitySet.getEntities().size() > n) { entitySet.getEntities().remove(entitySet.getEntities().size() - 1); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java index 4549a03..c9a8e65 100644 --- a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java +++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java @@ -24,7 +24,7 @@ import java.util.List; 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.Property; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -88,14 +88,14 @@ public class DataProviderTest { @Test public void esAllPrim() throws Exception { final DataProvider data = new DataProvider(); - EntitySet outSet = data.readAll(esAllPrim); + EntityCollection outSet = data.readAll(esAllPrim); Assert.assertEquals(3, outSet.getEntities().size()); Entity first = outSet.getEntities().get(0); Assert.assertEquals(16, first.getProperties().size()); Assert.assertEquals(2, first.getNavigationLinks().size()); - final EntitySet target = first.getNavigationLink("NavPropertyETTwoPrimMany").getInlineEntitySet(); + final EntityCollection target = first.getNavigationLink("NavPropertyETTwoPrimMany").getInlineEntitySet(); Assert.assertNotNull(target); Assert.assertEquals(1, target.getEntities().size()); Assert.assertEquals(data.readAll(entityContainer.getEntitySet("ESTwoPrim")).getEntities().get(1), @@ -107,7 +107,7 @@ public class DataProviderTest { @Test public void esCollAllPrim() throws Exception { - EntitySet outSet = new DataProvider().readAll(esCollAllPrim); + EntityCollection outSet = new DataProvider().readAll(esCollAllPrim); Assert.assertEquals(3, outSet.getEntities().size()); Assert.assertEquals(17, outSet.getEntities().get(0).getProperties().size()); @@ -120,7 +120,7 @@ public class DataProviderTest { @Test public void esCompAllPrim() throws Exception { - EntitySet outSet = new DataProvider().readAll(esCompAllPrim); + EntityCollection outSet = new DataProvider().readAll(esCompAllPrim); Assert.assertEquals(3, outSet.getEntities().size()); Assert.assertEquals(2, outSet.getEntities().get(0).getProperties().size()); @@ -133,7 +133,7 @@ public class DataProviderTest { @Test public void esMixPrimCollComp() throws Exception { - EntitySet outSet = new DataProvider().readAll(esMixPrimCollComp); + EntityCollection outSet = new DataProvider().readAll(esMixPrimCollComp); Assert.assertEquals(3, outSet.getEntities().size()); Assert.assertEquals(4, outSet.getEntities().get(0).getProperties().size()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java index 4864d24..0a593dc 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerEntityCollectionTest.java @@ -28,7 +28,7 @@ import java.math.BigDecimal; 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.Property; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -43,7 +43,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial public void esAllPrim() throws Exception { EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); InputStream stream = getFileAsStream("ESAllPrim.json"); - EntitySet entitySet = + EntityCollection entitySet = OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) .getEntityCollection(); @@ -78,7 +78,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial public void eSCompCollComp() throws Exception { EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETCompCollComp")); InputStream stream = getFileAsStream("ESCompCollComp.json"); - EntitySet entitySet = + EntityCollection entitySet = OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) .getEntityCollection(); @@ -100,7 +100,7 @@ public class ODataDeserializerEntityCollectionTest extends AbstractODataDeserial String entityCollectionString = "{\"value\" : []}"; InputStream stream = new ByteArrayInputStream(entityCollectionString.getBytes()); EdmEntityType edmEntityType = edm.getEntityType(new FullQualifiedName("Namespace1_Alias", "ETAllPrim")); - EntitySet entityCollection = + EntityCollection entityCollection = OData.newInstance().createDeserializer(ODataFormat.JSON).entityCollection(stream, edmEntityType) .getEntityCollection(); assertNotNull(entityCollection.getEntities()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java index 801377e..8d44be3 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java @@ -27,7 +27,7 @@ import org.apache.commons.io.IOUtils; import org.apache.olingo.commons.api.data.ContextURL; import org.apache.olingo.commons.api.data.ContextURL.Suffix; 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.ValueType; import org.apache.olingo.commons.api.edm.Edm; @@ -159,7 +159,7 @@ public class ODataJsonSerializerTest { @Test public void entitySetAllPrim() throws Exception { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESAllPrim"); - EntitySet entitySet = data.readAll(edmEntitySet); + EntityCollection entitySet = data.readAll(edmEntitySet); entitySet.setCount(entitySet.getEntities().size()); entitySet.setNext(URI.create("/next")); CountOption countOption = Mockito.mock(CountOption.class); @@ -305,7 +305,7 @@ public class ODataJsonSerializerTest { @Test public void entitySetTwoPrimNoMetadata() throws Exception { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESTwoPrim"); - final EntitySet entitySet = data.readAll(edmEntitySet); + final EntityCollection entitySet = data.readAll(edmEntitySet); InputStream result = new ODataJsonSerializer(ODataFormat.JSON_NO_METADATA) .entityCollection(metadata, edmEntitySet.getEntityType(), entitySet, EntityCollectionSerializerOptions.with() @@ -338,7 +338,7 @@ public class ODataJsonSerializerTest { @Test public void entitySetMedia() throws Exception { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESMedia"); - final EntitySet entitySet = data.readAll(edmEntitySet); + final EntityCollection entitySet = data.readAll(edmEntitySet); final String resultString = IOUtils.toString(serializer.entityCollection(metadata, edmEntitySet.getEntityType(), entitySet, EntityCollectionSerializerOptions.with() @@ -398,7 +398,7 @@ public class ODataJsonSerializerTest { public void selectComplex() throws Exception { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESCompComp"); final EdmEntityType entityType = edmEntitySet.getEntityType(); - final EntitySet entitySet = data.readAll(edmEntitySet); + final EntityCollection entitySet = data.readAll(edmEntitySet); final SelectOption select = ExpandSelectMock.mockSelectOption(Arrays.asList( ExpandSelectMock.mockSelectItem(edmEntitySet, "PropertyComp", "PropertyComp", "PropertyString"))); InputStream result = serializer @@ -422,7 +422,7 @@ public class ODataJsonSerializerTest { public void selectComplexTwice() throws Exception { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESCompComp"); final EdmEntityType entityType = edmEntitySet.getEntityType(); - final EntitySet entitySet = data.readAll(edmEntitySet); + final EntityCollection entitySet = data.readAll(edmEntitySet); final SelectOption select = ExpandSelectMock.mockSelectOption(Arrays.asList( ExpandSelectMock.mockSelectItem(edmEntitySet, "PropertyComp", "PropertyComp", "PropertyString"), ExpandSelectMock.mockSelectItem(edmEntitySet, "PropertyComp", "PropertyComp"))); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java ---------------------------------------------------------------------- diff --git a/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java b/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java index b8789bd..c2a1b1c 100644 --- a/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java +++ b/samples/server/src/main/java/org/apache/olingo/server/sample/data/DataProvider.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.olingo.commons.api.ODataException; 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.ValueType; import org.apache.olingo.commons.api.edm.EdmEntitySet; @@ -38,21 +38,21 @@ import org.apache.olingo.server.sample.edmprovider.CarsEdmProvider; public class DataProvider { - private final Map<String, EntitySet> data; + private final Map<String, EntityCollection> data; public DataProvider() { - data = new HashMap<String, EntitySet>(); + data = new HashMap<String, EntityCollection>(); data.put("Cars", createCars()); data.put("Manufacturers", createManufacturers()); } - public EntitySet readAll(EdmEntitySet edmEntitySet) { + public EntityCollection readAll(EdmEntitySet edmEntitySet) { return data.get(edmEntitySet.getName()); } public Entity read(final EdmEntitySet edmEntitySet, final List<UriParameter> keys) throws DataProviderException { final EdmEntityType entityType = edmEntitySet.getEntityType(); - final EntitySet entitySet = data.get(edmEntitySet.getName()); + final EntityCollection entitySet = data.get(edmEntitySet.getName()); if (entitySet == null) { return null; } else { @@ -93,8 +93,8 @@ public class DataProvider { } } - private EntitySet createCars() { - EntitySet entitySet = new EntitySet(); + private EntityCollection createCars() { + EntityCollection entitySet = new EntityCollection(); entitySet.getEntities().add(new Entity() .addProperty(createPrimitive("Id", 1)) @@ -137,8 +137,8 @@ public class DataProvider { return entitySet; } - private EntitySet createManufacturers() { - EntitySet entitySet = new EntitySet(); + private EntityCollection createManufacturers() { + EntityCollection entitySet = new EntityCollection(); entitySet.getEntities().add(new Entity() .addProperty(createPrimitive("Id", 1)) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d692d129/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java ---------------------------------------------------------------------- diff --git a/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java b/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java index 90df224..4305415 100644 --- a/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java +++ b/samples/server/src/main/java/org/apache/olingo/server/sample/processor/CarsProcessor.java @@ -27,7 +27,7 @@ import java.util.Locale; import org.apache.olingo.commons.api.data.ContextURL; import org.apache.olingo.commons.api.data.ContextURL.Suffix; 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.EdmComplexType; import org.apache.olingo.commons.api.edm.EdmEntitySet; @@ -97,7 +97,7 @@ public class CarsProcessor implements EntityCollectionProcessor, EntityProcessor // Second we fetch the data for this specific entity set from the mock database and transform it into an EntitySet // object which is understood by our serialization - EntitySet entitySet = dataProvider.readAll(edmEntitySet); + EntityCollection entitySet = dataProvider.readAll(edmEntitySet); // Next we create a serializer based on the requested format. This could also be a custom format but we do not // support them in this example
