You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/10/09 14:38:58 UTC
olingo-odata4 git commit: [OLINGO-794] Removed outdated 'inlinecount'
Repository: olingo-odata4
Updated Branches:
refs/heads/master f221962f7 -> 9933cb0bd
[OLINGO-794] Removed outdated 'inlinecount'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/9933cb0b
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/9933cb0b
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/9933cb0b
Branch: refs/heads/master
Commit: 9933cb0bdc0828735ea746b26d5fc5d205da2198
Parents: f221962
Author: mibo <mi...@apache.org>
Authored: Fri Oct 9 14:30:56 2015 +0200
Committer: mibo <mi...@apache.org>
Committed: Fri Oct 9 14:38:22 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/olingo/fit/AbstractServices.java | 6 +++---
fit/src/main/java/org/apache/olingo/fit/Services.java | 2 +-
.../apache/olingo/fit/base/QueryOptionsTestITCase.java | 2 +-
.../org/apache/olingo/client/api/uri/QueryOption.java | 12 ++----------
.../client/core/domain/AbstractClientEntitySet.java | 2 +-
5 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9933cb0b/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 100aff5..fc886ff 100644
--- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
+++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
@@ -936,7 +936,7 @@ public abstract class AbstractServices {
@QueryParam("$top") @DefaultValue(StringUtils.EMPTY) final String top,
@QueryParam("$skip") @DefaultValue(StringUtils.EMPTY) final String skip,
@QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
- @QueryParam("$inlinecount") @DefaultValue(StringUtils.EMPTY) final String count,
+ @QueryParam("$count") @DefaultValue(StringUtils.EMPTY) final String count,
@QueryParam("$filter") @DefaultValue(StringUtils.EMPTY) final String filter,
@QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) final String orderby,
@QueryParam("$skiptoken") @DefaultValue(StringUtils.EMPTY) final String skiptoken,
@@ -1038,7 +1038,7 @@ public abstract class AbstractServices {
* @param accept Accept header.
* @param name entity set or function name.
* @param format format query option.
- * @param count inlinecount query option.
+ * @param count count query option.
* @param filter filter query option.
* @param orderby orderby query option.
* @param skiptoken skiptoken query option.
@@ -1053,7 +1053,7 @@ public abstract class AbstractServices {
@QueryParam("$top") @DefaultValue(StringUtils.EMPTY) final String top,
@QueryParam("$skip") @DefaultValue(StringUtils.EMPTY) final String skip,
@QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
- @QueryParam("$inlinecount") @DefaultValue(StringUtils.EMPTY) final String count,
+ @QueryParam("$count") @DefaultValue(StringUtils.EMPTY) final String count,
@QueryParam("$filter") @DefaultValue(StringUtils.EMPTY) final String filter,
@QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) final String orderby,
@QueryParam("$skiptoken") @DefaultValue(StringUtils.EMPTY) final String skiptoken) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9933cb0b/fit/src/main/java/org/apache/olingo/fit/Services.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/Services.java b/fit/src/main/java/org/apache/olingo/fit/Services.java
index cb85329..45f11a5 100644
--- a/fit/src/main/java/org/apache/olingo/fit/Services.java
+++ b/fit/src/main/java/org/apache/olingo/fit/Services.java
@@ -383,7 +383,7 @@ public class Services extends AbstractServices {
@QueryParam("$top") @DefaultValue(StringUtils.EMPTY) final String top,
@QueryParam("$skip") @DefaultValue(StringUtils.EMPTY) final String skip,
@QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
- @QueryParam("$inlinecount") @DefaultValue(StringUtils.EMPTY) final String count,
+ @QueryParam("$count") @DefaultValue(StringUtils.EMPTY) final String count,
@QueryParam("$filter") @DefaultValue(StringUtils.EMPTY) final String filter,
@QueryParam("$search") @DefaultValue(StringUtils.EMPTY) final String search,
@QueryParam("$orderby") @DefaultValue(StringUtils.EMPTY) final String orderby,
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9933cb0b/fit/src/test/java/org/apache/olingo/fit/base/QueryOptionsTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/base/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/QueryOptionsTestITCase.java
index cd937ab..0705384 100644
--- a/fit/src/test/java/org/apache/olingo/fit/base/QueryOptionsTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/base/QueryOptionsTestITCase.java
@@ -185,7 +185,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
}
/**
- * Test <tt>$inlinecount</tt>.
+ * Test <tt>$count</tt>.
*/
@Test
public void count() {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9933cb0b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/QueryOption.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/QueryOption.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/QueryOption.java
index 06e884e..8d87197 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/QueryOption.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/QueryOption.java
@@ -72,9 +72,8 @@ public enum QueryOption {
*/
SKIP,
/**
- * This query option applies only to the OData 2.0 protocol to the AtomPub protocol. The value of a $skiptoken query
- * option is an opaque token which identifies an index into the collection of entities identified by the URI
- * containing the $skiptoken parameter.
+ * The value of a $skiptoken query option is an opaque token which identifies an index into the collection
+ * of entities identified by the URI containing the $skiptoken parameter.
*/
SKIPTOKEN,
/**
@@ -83,13 +82,6 @@ public enum QueryOption {
*/
FILTER,
/**
- * For a value of "allpages", this option indicates that the response to the request MUST include the count of the
- * number of entities in the EntitySet, identified by the resource path section of the URI after all $filter system
- * query options have been applied. For a value of "none", this option indicates that the response to the request MUST
- * NOT include the count value.
- */
- INLINECOUNT,
- /**
* Search expressions are used within the $search system query option to request entities matching the specified
* expression.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9933cb0b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/AbstractClientEntitySet.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/AbstractClientEntitySet.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/AbstractClientEntitySet.java
index b57960a..d59af93 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/AbstractClientEntitySet.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/AbstractClientEntitySet.java
@@ -33,7 +33,7 @@ public abstract class AbstractClientEntitySet extends AbstractClientPayload impl
/**
* Number of ODataEntities contained in this entity set.
* <br/>
- * If <tt>$inlinecount</tt> was requested, this value comes from there.
+ * If <tt>$count</tt> was requested, this value comes from there.
*/
private Integer count;