You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ra...@apache.org on 2016/03/28 17:16:55 UTC
[1/2] olingo-odata4 git commit: OLINGO-915: Support system options
with FunctionImports based the return types rather than restricting only to
composable functions
Repository: olingo-odata4
Updated Branches:
refs/heads/master 18b126742 -> 981084fe1
OLINGO-915: Support system options with FunctionImports based the return types rather than restricting only to composable functions
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/1a41ae8d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/1a41ae8d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/1a41ae8d
Branch: refs/heads/master
Commit: 1a41ae8d30e82cb4b0202bb79fa3ab5b541069f4
Parents: 300316d
Author: Ramesh Reddy <ra...@jboss.org>
Authored: Mon Mar 28 10:12:00 2016 -0500
Committer: Ramesh Reddy <ra...@jboss.org>
Committed: Mon Mar 28 10:12:00 2016 -0500
----------------------------------------------------------------------
.../server/core/uri/validator/UriValidator.java | 3 --
.../core/uri/parser/TestFullResourcePath.java | 29 ++++++--------------
2 files changed, 8 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1a41ae8d/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 cec2fc0..9c076b2 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
@@ -255,9 +255,6 @@ public class UriValidator {
private UriType getUriTypeForFunction(final UriResource lastPathSegment) throws UriValidationException {
final UriResourceFunction uriFunction = (UriResourceFunction) lastPathSegment;
- if (!uriFunction.getFunction().isComposable()) {
- return UriType.none;
- }
final boolean isCollection = uriFunction.isCollection();
final EdmTypeKind typeKind = uriFunction.getFunction().getReturnType().getType().getKind();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1a41ae8d/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java
index 2596f5c..c2eb419 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/TestFullResourcePath.java
@@ -1236,27 +1236,14 @@ public class TestFullResourcePath {
testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')(0)/PropertyInt16")
.isExValidation(UriValidationException.MessageKeys.UNALLOWED_RESOURCE_PATH);
- testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$skip=1")
- .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED);
-
- testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$top=1")
- .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED);
-
- testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')",
- "$filter=PropertyInt16 eq 1")
- .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED);
-
- testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$skip=1")
- .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED);
-
- testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$count=true")
- .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED);
-
- testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$skiptoken=5")
- .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED);
-
- testUri.runEx("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$search=test")
- .isExValidation(UriValidationException.MessageKeys.SYSTEM_QUERY_OPTION_NOT_ALLOWED);
+ testUri.run("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$skip=1");
+ testUri.run("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$top=1");
+ testUri.run("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')",
+ "$filter=PropertyInt16 eq 1");
+ testUri.run("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$skip=1");
+ testUri.run("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$count=true");
+ testUri.run("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$skiptoken=5");
+ testUri.run("FICRTCollETMixPrimCollCompTwoParam(ParameterInt16=1,ParameterString='1')", "$search=test");
testUri.run("ESAllPrim/olingo.odata.test1.BFNESAllPrimRTCTAllPrim()")
.isKind(UriInfoKind.resource)
[2/2] olingo-odata4 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata4
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/981084fe
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/981084fe
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/981084fe
Branch: refs/heads/master
Commit: 981084fe11ba1116d3ad732fdef88efd8f53121d
Parents: 1a41ae8 18b1267
Author: Ramesh Reddy <ra...@jboss.org>
Authored: Mon Mar 28 10:12:13 2016 -0500
Committer: Ramesh Reddy <ra...@jboss.org>
Committed: Mon Mar 28 10:12:13 2016 -0500
----------------------------------------------------------------------
.../olingo/server/core/ODataHandlerImpl.java | 4 ---
.../core/batchhandler/BatchFacadeImpl.java | 1 -
.../core/batchhandler/BatchPartHandler.java | 1 -
.../server/core/uri/parser/ParserHelper.java | 36 +++++++++++++++-----
.../server/core/uri/parser/ParserTest.java | 27 +++++++++++++++
.../myservice/mynamespace/data/Storage.java | 14 +++++---
.../myservice/mynamespace/data/Storage.java | 14 +++++---
7 files changed, 74 insertions(+), 23 deletions(-)
----------------------------------------------------------------------