You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/11/28 06:30:20 UTC
[12/47] olingo-odata4 git commit: [OLINGO-568] Added
SearchTokenizerException
[OLINGO-568] Added SearchTokenizerException
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/3eef0bf6
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/3eef0bf6
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/3eef0bf6
Branch: refs/heads/OLINGO-811_CountForExpand
Commit: 3eef0bf605b4eff6c724f15e661d9c9c44964ddc
Parents: f64abe1
Author: mibo <mi...@apache.org>
Authored: Tue Nov 10 20:10:02 2015 +0100
Committer: mibo <mi...@apache.org>
Committed: Tue Nov 10 20:10:02 2015 +0100
----------------------------------------------------------------------
.../core/uri/parser/search/SearchParser.java | 6 +-
.../core/uri/parser/search/SearchTokenizer.java | 63 ++++++++++----------
.../parser/search/SearchTokenizerException.java | 25 ++++++++
.../uri/parser/search/SearchTokenizerTest.java | 31 ++++++----
4 files changed, 82 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3eef0bf6/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java
index d508932..ca45037 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchParser.java
@@ -27,7 +27,11 @@ public class SearchParser {
public SearchOption parse(String path, String value) {
SearchTokenizer tokenizer = new SearchTokenizer();
- List<SearchQueryToken> tokens = tokenizer.tokenize(value);
+ try {
+ List<SearchQueryToken> tokens = tokenizer.tokenize(value);
+ } catch (SearchTokenizerException e) {
+ return null;
+ }
return new SearchOptionImpl();
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3eef0bf6/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
index f393d22..1ec4df1 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
@@ -58,14 +58,14 @@ public class SearchTokenizer {
token = t;
}
- protected abstract State nextChar(char c);
+ protected abstract State nextChar(char c) throws SearchTokenizerException;
public State allowed(char c) {
return this;
}
- public State forbidden(char c) {
- throw new IllegalStateException(this.getClass().getName() + "->" + c);
+ public State forbidden(char c) throws SearchTokenizerException {
+ throw new SearchTokenizerException("Forbidden character for " + this.getClass().getName() + "->" + c);
}
public State finish() {
@@ -105,7 +105,7 @@ public class SearchTokenizer {
* @return true if character is allowed for a phrase
*/
static boolean isAllowedPhrase(final char character) {
- // FIXME mibo: check missing and '\''
+ // FIXME mibo: check missing
return isAllowedChar(character)
|| character == '-'
|| character == '.'
@@ -115,6 +115,7 @@ public class SearchTokenizer {
|| character == '@'
|| character == '/'
|| character == '$'
+ || character == '\''
|| character == '=';
}
@@ -142,7 +143,7 @@ public class SearchTokenizer {
public LiteralState(Token t) {
super(t);
}
- public LiteralState(Token t, char c) {
+ public LiteralState(Token t, char c) throws SearchTokenizerException {
super(t);
init(c);
}
@@ -159,9 +160,9 @@ public class SearchTokenizer {
return literal.toString();
}
- public State init(char c) {
+ public State init(char c) throws SearchTokenizerException {
if(isFinished()) {
- throw new IllegalStateException(toString() + " is already finished.");
+ throw new SearchTokenizerException(toString() + " is already finished.");
}
literal.append(c);
return this;
@@ -176,7 +177,7 @@ public class SearchTokenizer {
super(null, initLiteral);
}
@Override
- public State nextChar(char c) {
+ public State nextChar(char c) throws SearchTokenizerException {
if (c == CHAR_OPEN) {
return new OpenState();
} else if (isWhitespace(c)) {
@@ -189,7 +190,7 @@ public class SearchTokenizer {
}
@Override
- public State init(char c) {
+ public State init(char c) throws SearchTokenizerException {
return nextChar(c);
}
}
@@ -199,7 +200,7 @@ public class SearchTokenizer {
super(Token.TERM);
}
@Override
- public State nextChar(char c) {
+ public State nextChar(char c) throws SearchTokenizerException {
if(c == CHAR_N) {
return new NotState(c);
} else if (c == QUOTATION_MARK) {
@@ -207,16 +208,16 @@ public class SearchTokenizer {
} else if (isAllowedChar(c)) {
return new SearchWordState(c);
}
- throw new IllegalStateException(this.getClass().getName() + "->" + c);
+ return forbidden(c);
}
@Override
- public State init(char c) {
+ public State init(char c) throws SearchTokenizerException {
return nextChar(c);
}
}
private class SearchWordState extends LiteralState {
- public SearchWordState(char c) {
+ public SearchWordState(char c) throws SearchTokenizerException {
super(Token.WORD, c);
}
public SearchWordState(State toConsume) {
@@ -224,7 +225,7 @@ public class SearchTokenizer {
}
@Override
- public State nextChar(char c) {
+ public State nextChar(char c) throws SearchTokenizerException {
if (isAllowedChar(c)) {
return allowed(c);
} else if (c == CHAR_CLOSE) {
@@ -244,7 +245,7 @@ public class SearchTokenizer {
}
private class SearchPhraseState extends LiteralState {
- public SearchPhraseState(char c) {
+ public SearchPhraseState(char c) throws SearchTokenizerException {
super(Token.PHRASE, c);
if(c != QUOTATION_MARK) {
forbidden(c);
@@ -252,19 +253,17 @@ public class SearchTokenizer {
}
@Override
- public State nextChar(char c) {
- if(isFinished()) {
- return new SearchExpressionState().init(c);
- } else if (isAllowedPhrase(c)) {
+ public State nextChar(char c) throws SearchTokenizerException {
+ if (isAllowedPhrase(c)) {
+ return allowed(c);
+ } else if (isWhitespace(c)) {
return allowed(c);
} else if (c == QUOTATION_MARK) {
finish();
allowed(c);
return new SearchExpressionState();
- } else if (isWhitespace(c)) {
- return allowed(c);
- } else if (c == CHAR_CLOSE) {
- return allowed(c);
+ } else if(isFinished()) {
+ return new SearchExpressionState().init(c);
}
return forbidden(c);
}
@@ -276,7 +275,7 @@ public class SearchTokenizer {
finish();
}
@Override
- public State nextChar(char c) {
+ public State nextChar(char c) throws SearchTokenizerException {
finish();
if (isWhitespace(c)) {
return forbidden(c);
@@ -292,13 +291,13 @@ public class SearchTokenizer {
}
@Override
- public State nextChar(char c) {
+ public State nextChar(char c) throws SearchTokenizerException {
return new SearchExpressionState().init(c);
}
}
private class NotState extends LiteralState {
- public NotState(char c) {
+ public NotState(char c) throws SearchTokenizerException {
super(Token.NOT, c);
if(c != CHAR_N) {
forbidden(c);
@@ -306,11 +305,11 @@ public class SearchTokenizer {
}
@Override
public State nextChar(char c) {
- if (getLiteral().length() == 1 && c == CHAR_O) {
+ if (literal.length() == 1 && c == CHAR_O) {
return allowed(c);
- } else if (getLiteral().length() == 2 && c == CHAR_T) {
+ } else if (literal.length() == 2 && c == CHAR_T) {
return allowed(c);
- } else if(getLiteral().length() == 3 && isWhitespace(c)) {
+ } else if(literal.length() == 3 && isWhitespace(c)) {
finish();
return new BeforeSearchExpressionRwsState();
} else {
@@ -326,7 +325,7 @@ public class SearchTokenizer {
super(null);
}
@Override
- public State nextChar(char c) {
+ public State nextChar(char c) throws SearchTokenizerException {
if (isWhitespace(c)) {
return allowed(c);
} else {
@@ -342,7 +341,7 @@ public class SearchTokenizer {
super(null);
}
@Override
- public State nextChar(char c) {
+ public State nextChar(char c) throws SearchTokenizerException {
if (!noneRws && isWhitespace(c)) {
return allowed(c);
} else if (c == CHAR_O) {
@@ -374,7 +373,7 @@ public class SearchTokenizer {
}
// TODO (mibo): add (new) parse exception
- public List<SearchQueryToken> tokenize(String searchQuery) {
+ public List<SearchQueryToken> tokenize(String searchQuery) throws SearchTokenizerException {
char[] chars = searchQuery.toCharArray();
State state = new SearchExpressionState();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3eef0bf6/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerException.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerException.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerException.java
new file mode 100644
index 0000000..dd6f71e
--- /dev/null
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerException.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.server.core.uri.parser.search;
+
+public class SearchTokenizerException extends Exception {
+ public SearchTokenizerException(String message) {
+ super(message);
+ }
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3eef0bf6/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerTest.java
index 548d3fd..ea3cab9 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizerTest.java
@@ -150,7 +150,7 @@ public class SearchTokenizerTest {
}
@Test
- public void parseImplicitAnd() {
+ public void parseImplicitAnd() throws SearchTokenizerException {
SearchValidator.init("a b").addExpected(WORD, AND, WORD).validate();
SearchValidator.init("a b OR c").addExpected(WORD, AND, WORD, OR, WORD).validate();
SearchValidator.init("a bc OR c").addExpected(WORD, AND, WORD, OR, WORD).validate();
@@ -305,7 +305,7 @@ public class SearchTokenizerTest {
}
@Test
- public void moreMixedTests() {
+ public void moreMixedTests() throws SearchTokenizerException {
validate("abc");
validate("NOT abc");
@@ -340,20 +340,23 @@ public class SearchTokenizerTest {
}
@Test
- public void parseInvalid() {
+ public void parseInvalid() throws SearchTokenizerException {
SearchValidator.init("abc AND OR something").validate();
+ SearchValidator.init("abc AND \"something\" )").validate();
+ //
+ SearchValidator.init("( abc AND) OR something").validate(SearchTokenizerException.class);
}
- public boolean validate(String query) {
- return new SearchValidator(query).validate();
+ public void validate(String query) throws SearchTokenizerException {
+ new SearchValidator(query).validate();
}
- public boolean validate(String query, SearchQueryToken.Token ... tokens) {
+ public void validate(String query, SearchQueryToken.Token ... tokens) throws SearchTokenizerException {
SearchValidator sv = new SearchValidator(query);
for (SearchQueryToken.Token token : tokens) {
sv.addExpected(token);
}
- return sv.validate();
+ sv.validate();
}
private static class SearchValidator {
@@ -393,7 +396,17 @@ public class SearchTokenizerTest {
}
return this;
}
- private boolean validate() {
+ private void validate(Class<? extends Exception> exception) throws SearchTokenizerException {
+ try {
+ new SearchTokenizer().tokenize(searchQuery);
+ } catch (Exception e) {
+ Assert.assertEquals(exception, e.getClass());
+ return;
+ }
+ Assert.fail("Expected exception " + exception.getClass().getSimpleName() + " was not thrown.");
+ }
+
+ private void validate() throws SearchTokenizerException {
SearchTokenizer tokenizer = new SearchTokenizer();
List<SearchQueryToken> result = tokenizer.tokenize(searchQuery);
Assert.assertNotNull(result);
@@ -412,8 +425,6 @@ public class SearchTokenizerTest {
}
}
}
-
- return true;
}
}