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

[OLINGO-568] Fixed issue with implicit and

This commit is contained in:
Michael Bolz 2015-11-10 06:25:54 +01:00
parent 96483ae559
commit f64abe136b
2 changed files with 40 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,11 @@ public class SearchTokenizer {
return this;
}
public State finish(Token token) {
this.token = token;
return finish();
}
public boolean isFinished() {
return finished;
}
@ -167,12 +172,15 @@ public class SearchTokenizer {
public SearchExpressionState() {
super(null);
}
public SearchExpressionState(String initLiteral) {
super(null, initLiteral);
}
@Override
public State nextChar(char c) {
if (c == CHAR_OPEN) {
return new OpenState();
} else if (isWhitespace(c)) {
return new RwsImplicitAndState();
return new RwsImplicitAndOrState();
} else if(c == CHAR_CLOSE) {
return new CloseState();
} else {
@ -224,7 +232,7 @@ public class SearchTokenizer {
return new CloseState();
} else if (isWhitespace(c)) {
finish();
return new RwsImplicitAndState();
return new RwsImplicitAndOrState();
}
return forbidden(c);
}
@ -254,14 +262,8 @@ public class SearchTokenizer {
allowed(c);
return new SearchExpressionState();
} else if (isWhitespace(c)) {
if(isFinished()) {
return new RwsImplicitAndState();
}
return allowed(c);
} else if (c == CHAR_CLOSE) {
if(isFinished()) {
return new CloseState();
}
return allowed(c);
}
return forbidden(c);
@ -317,48 +319,6 @@ public class SearchTokenizer {
}
}
private class AndState extends LiteralState {
public AndState(char c) {
super(Token.AND, c);
if(c != CHAR_A) {
forbidden(c);
}
}
@Override
public State nextChar(char c) {
if (literal.length() == 1 && c == CHAR_N) {
return allowed(c);
} else if (literal.length() == 2 && c == CHAR_D) {
return allowed(c);
} else if(literal.length() == 3 && isWhitespace(c)) {
finish();
return new BeforeSearchExpressionRwsState();
} else {
return new SearchWordState(this);
}
}
}
private class OrState extends LiteralState {
public OrState(char c) {
super(Token.OR, c);
if(c != CHAR_O) {
forbidden(c);
}
}
@Override
public State nextChar(char c) {
if (literal.length() == 1 && (c == CHAR_R)) {
return allowed(c);
} else if(literal.length() == 2 && isWhitespace(c)) {
finish();
return new BeforeSearchExpressionRwsState();
} else {
return new SearchWordState(this);
}
}
}
// RWS 'OR' RWS searchExpr
// RWS [ 'AND' RWS ] searchExpr
private class BeforeSearchExpressionRwsState extends State {
@ -376,21 +336,39 @@ public class SearchTokenizer {
}
// implicit and
private class RwsImplicitAndState extends State {
public RwsImplicitAndState() {
super(Token.AND);
private class RwsImplicitAndOrState extends LiteralState {
private boolean noneRws = false;
public RwsImplicitAndOrState() {
super(null);
}
@Override
public State nextChar(char c) {
if (isWhitespace(c)) {
if (!noneRws && isWhitespace(c)) {
return allowed(c);
} else if (c == CHAR_O) {
return new OrState(c);
noneRws = true;
return allowed(c);
} else if (literal.length() == 1 && c == CHAR_R) {
return allowed(c);
} else if (literal.length() == 2 && isWhitespace(c)) {
finish(Token.OR);
return new BeforeSearchExpressionRwsState();
} else if (c == CHAR_A) {
return new AndState(c);
noneRws = true;
return allowed(c);
} else if (literal.length() == 1 && c == CHAR_N) {
return allowed(c);
} else if (literal.length() == 2 && c == CHAR_D) {
return allowed(c);
} else if(literal.length() == 3 && isWhitespace(c)) {
finish(Token.AND);
return new BeforeSearchExpressionRwsState();
} else if(noneRws) {
finish(Token.AND);
return new SearchWordState(this);
} else {
finish();
return new SearchExpressionState().init(c);
finish(Token.AND);
return new SearchExpressionState(literal.toString()).init(c);
}
}
}

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

@ -290,12 +290,11 @@ public class SearchTokenizerTest {
SearchValidator.init("abc AND ANDsomething")
.addExpected(WORD, AND, WORD).validate();
// FIXME (mibo): issue with implicit and
// SearchValidator.init("abc ANDsomething").enableLogging()
// .addExpected(WORD, AND, WORD).validate();
SearchValidator.init("abc ANDsomething")
.addExpected(WORD, AND, WORD).validate();
// SearchValidator.init("abc ORsomething")
// .addExpected(WORD, AND, WORD).validate();
SearchValidator.init("abc ORsomething")
.addExpected(WORD, AND, WORD).validate();
SearchValidator.init("abc OR orsomething")
.addExpected(WORD, OR, WORD).validate();