Repository: olingo-odata4 Updated Branches: refs/heads/master 43feffc48 -> 9a96ec4f9
[OLINGO-935] $apply is allowed for $count Signed-off-by: Christian Amend <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/9a96ec4f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/9a96ec4f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/9a96ec4f Branch: refs/heads/master Commit: 9a96ec4f9bab309a4453f28e8540e28824e12a6d Parents: 43feffc Author: Klaus Straubinger <[email protected]> Authored: Wed Apr 27 10:07:21 2016 +0200 Committer: Christian Amend <[email protected]> Committed: Fri Apr 29 14:32:07 2016 +0200 ---------------------------------------------------------------------- .../olingo/server/core/uri/validator/UriValidator.java | 4 ++-- .../olingo/server/core/uri/validator/UriValidatorTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9a96ec4f/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java index 64c3cf7..d523226 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java @@ -53,14 +53,14 @@ public class UriValidator { /* metadata 4 */ { false, true , false, false, false, false, false, false, false, false, false, false }, /* service 5 */ { false, true , false, false, false, false, false, false, false, false, false, false }, /* entitySet 6 */ { true , true , true , false, true , true , true , true , true , true , true , true }, - /* entitySetCount 7 */ { true , false, false, false, false, false, true , false, false, false, false, false }, + /* entitySetCount 7 */ { true , false, false, false, false, false, true , false, false, false, false, true }, /* entity 8 */ { false, true , true , false, false, false, false, true , false, false, false, false }, /* mediaStream 9 */ { false, false, false, false, false, false, false, false, false, false, false, false }, /* references 10 */ { true , true , false, false, true , true , true , false, true , true , true , false }, /* reference 11 */ { false, true , false, false, false, false, false, false, false, false, false, false }, /* propertyComplex 12 */ { false, true , true , false, false, false, false, true , false, false, false, false }, /* propertyComplexCollection 13 */ { true , true , true , false, true , true , false, true , true , true , true , true }, - /* propertyComplexCollectionCount 14 */ { true , false, false, false, false, false, false, false, false, false, false, false }, + /* propertyComplexCollectionCount 14 */ { true , false, false, false, false, false, false, false, false, false, false, true }, /* propertyPrimitive 15 */ { false, true , false, false, false, false, false, false, false, false, false, false }, /* propertyPrimitiveCollection 16 */ { true , true , false, false, true , true , false, false, true , true , true , false }, /* propertyPrimitiveCollectionCount 17 */ { true , false, false, false, false, false, false, false, false, false, false, false }, http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9a96ec4f/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java index 789e65f..61cc000 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java @@ -112,7 +112,7 @@ public class UriValidatorTest { { URI_ENTITY_SET, QO_SELECT }, { URI_ENTITY_SET, QO_SKIP }, { URI_ENTITY_SET, QO_SKIPTOKEN }, { URI_ENTITY_SET, QO_TOP }, { URI_ENTITY_SET, QO_APPLY }, - { URI_ENTITY_SET_COUNT, QO_FILTER }, { URI_ENTITY_SET_COUNT, QO_SEARCH }, + { URI_ENTITY_SET_COUNT, QO_FILTER }, { URI_ENTITY_SET_COUNT, QO_SEARCH }, { URI_ENTITY_SET_COUNT, QO_APPLY }, { URI_ENTITY, QO_FORMAT }, { URI_ENTITY, QO_EXPAND }, { URI_ENTITY, QO_SELECT }, @@ -130,7 +130,7 @@ public class UriValidatorTest { { URI_PROPERTY_COMPLEX_COLLECTION, QO_SKIP }, { URI_PROPERTY_COMPLEX_COLLECTION, QO_SKIPTOKEN }, { URI_PROPERTY_COMPLEX_COLLECTION, QO_TOP }, { URI_PROPERTY_COMPLEX_COLLECTION, QO_APPLY }, - { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_FILTER }, + { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_FILTER }, { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_APPLY }, { URI_PROPERTY_PRIMITIVE, QO_FORMAT }, @@ -195,7 +195,7 @@ public class UriValidatorTest { { URI_ENTITY_SET_COUNT, QO_EXPAND }, { URI_ENTITY_SET_COUNT, QO_COUNT }, { URI_ENTITY_SET_COUNT, QO_ORDERBY }, { URI_ENTITY_SET_COUNT, QO_SELECT }, { URI_ENTITY_SET_COUNT, QO_SKIP }, { URI_ENTITY_SET_COUNT, QO_SKIPTOKEN }, - { URI_ENTITY_SET_COUNT, QO_TOP }, { URI_ENTITY_SET_COUNT, QO_APPLY }, + { URI_ENTITY_SET_COUNT, QO_TOP }, { URI_ENTITY, QO_FILTER }, { URI_ENTITY, QO_ID }, { URI_ENTITY, QO_COUNT }, { URI_ENTITY, QO_ORDERBY }, { URI_ENTITY, QO_SEARCH }, { URI_ENTITY, QO_SKIP }, { URI_ENTITY, QO_SKIPTOKEN }, { URI_ENTITY, QO_TOP }, @@ -226,7 +226,7 @@ public class UriValidatorTest { { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_COUNT }, { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_ORDERBY }, { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_SEARCH }, { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_SELECT }, { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_SKIP }, { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_SKIPTOKEN }, - { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_TOP }, { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_APPLY }, + { URI_PROPERTY_COMPLEX_COLLECTION_COUNT, QO_TOP }, { URI_PROPERTY_PRIMITIVE, QO_FILTER }, { URI_PROPERTY_PRIMITIVE, QO_ID }, { URI_PROPERTY_PRIMITIVE, QO_EXPAND }, { URI_PROPERTY_PRIMITIVE, QO_COUNT }, { URI_PROPERTY_PRIMITIVE, QO_ORDERBY },
