Merge branch 'OLINGO-1046'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/4a51d164 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/4a51d164 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/4a51d164 Branch: refs/heads/master Commit: 4a51d16425144a7de0be0f9dcd01c667bed322df Parents: 74a2da7 2751c13 Author: Ramesh Reddy <[email protected]> Authored: Thu Apr 27 08:36:56 2017 -0500 Committer: Ramesh Reddy <[email protected]> Committed: Thu Apr 27 08:36:56 2017 -0500 ---------------------------------------------------------------------- .../server/core/uri/parser/ExpandParser.java | 1 + .../core/uri/parser/ExpressionParser.java | 41 +++++++++++++++++++- .../server/core/uri/parser/ParserHelper.java | 4 ++ .../server/core/uri/parser/SearchParser.java | 2 + .../server/core/uri/parser/UriTokenizer.java | 2 +- .../core/uri/parser/ExpressionParserTest.java | 10 +++++ 6 files changed, 58 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
