Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-1417]Serach query to support +

This commit is contained in:
ramya vasanth 2020-01-14 14:57:02 +05:30
parent cb6a7ce346
commit 1df2f4aa67
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
View File

@ -54,9 +54,6 @@ public class SearchTokenizer {
protected static final char CHAR_R = 'R';
protected static final char CHAR_CLOSE = ')';
protected static final char CHAR_OPEN = '(';
protected static final char CHAR_COMMA = ',';
protected static final char CHAR_DOT = '.';
protected static final char CHAR_HYPEN = '-';
public State() {}
@ -123,10 +120,8 @@ public class SearchTokenizer {
static boolean isAllowedWord(final char character) {
return Character.isUnicodeIdentifierStart(character)
|| Character.DASH_PUNCTUATION == Character.getType(character)
|| Character.DECIMAL_DIGIT_NUMBER == Character.getType(character)
|| (Character.OTHER_PUNCTUATION == Character.getType(character) &&
(character != ';' && character != '"'));
|| isUnreserved(character)
|| isOtherDelimsForWord(character);
}
/**
@ -206,6 +201,26 @@ public class SearchTokenizer {
|| character == ';';
}
/**
* other-delims = "!" / "(" / ")" / "*" / "+" / "," / ";"
* @param character which is checked
* @return true if character is allowed
*/
private static boolean isOtherDelimsForWord(final char character) {
return character == '!'
|| character == '*'
|| character == '+'
|| character == ','
|| character == ':'
|| character == '@'
|| character == '/'
|| character == '?'
|| character == '$'
|| character == '='
|| character == '%'
|| character == '\'';
}
/**
* unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
* @param character which is checked
@ -352,11 +367,7 @@ public class SearchTokenizer {
@Override
public State nextChar(final char c) throws SearchTokenizerException {
if (isAllowedWord(c) ||
('0' <= c && c <= '9') ||
(c == CHAR_COMMA) ||
(c == CHAR_DOT) ||
(c == CHAR_HYPEN)) {
if (isAllowedWord(c)) {
return allowed(c);
} else if (c == CHAR_CLOSE) {
finish();

1
lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerTest.java
View File

@ -45,6 +45,7 @@ public class SearchTokenizerTest {
@Test
public void parseWords() throws Exception {
assertQuery("C++%20=$@:,*!/?'%27").resultsIn(WORD);
assertQuery("somesimpleword").resultsIn(WORD);
assertQuery("anotherWord\u1234").resultsIn(WORD);
// special