CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-03 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed empty search string throwing an exception.

Browse Source
This commit is contained in:
Vesa Martilla 2011-01-04 11:02:23 +00:00
parent 6756b4726c
commit e393ebc48c
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneSerializer.java
View File

@ -305,7 +305,7 @@ public class LuceneSerializer {
}
}
private Query stringRange(String field, @Nullable Expression<?> min, @Nullable Expression<?> max,
private Query stringRange(String field, @Nullable Expression<?> min, @Nullable Expression<?> max,
boolean minInc, boolean maxInc, QueryMetadata metadata) {
if (min == null) {
return new TermRangeQuery(field, null, normalize(createTerms(max, metadata)[0]), minInc, maxInc);
@ -376,7 +376,11 @@ public class LuceneSerializer {
} else if (expr instanceof TermElement) {
return new String[] { str };
} else if (splitTerms) {
return StringUtils.split(str);
if (str.equals("")) {
return new String[] { str };
} else {
return StringUtils.split(str);
}
} else {
return new String[] { str };
}

45
querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerTest.java
View File

@ -14,6 +14,7 @@ import java.util.Arrays;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.NumericField;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.index.IndexWriter;
@ -59,6 +60,7 @@ public class LuceneSerializerTest {
private StringPath author;
private StringPath text;
private StringPath rating;
private StringPath publisher;
private NumberPath<Integer> year;
private NumberPath<Double> gross;
@ -87,6 +89,7 @@ public class LuceneSerializerTest {
doc.add(new Field("author", new StringReader("Michael Crichton")));
doc.add(new Field("text", new StringReader("It's a UNIX system! I know this!")));
doc.add(new Field("rating", new StringReader("Good")));
doc.add(new Field("publisher", "", Store.YES, Index.ANALYZED));
doc.add(new NumericField("year", Store.YES, true).setIntValue(1990));
doc.add(new NumericField("gross", Store.YES, true).setDoubleValue(900.00));
@ -106,6 +109,7 @@ public class LuceneSerializerTest {
title = entityPath.getString("title");
author = entityPath.getString("author");
text = entityPath.getString("text");
publisher = entityPath.getString("publisher");
year = entityPath.getNumber("year", Integer.class);
rating = entityPath.getString("rating");
gross = entityPath.getNumber("gross", Double.class);
@ -259,6 +263,12 @@ public class LuceneSerializerTest {
testQuery(title.eq("Jurassic Park"), "title:\"jurassic park\"", 1);
}
@Test
@Ignore("Not easily done in Lucene!")
public void Publisher_Equals_Empty_String() throws Exception {
testQuery(publisher.eq(""), "publisher:", 1);
}
@Test
public void eq_Phrase_Should_Not_Find_Results_But_Lucene_Semantics_Differs_From_Querydsls() throws Exception {
testQuery(text.eq("UNIX System"), "text:\"unix system\"", 1);
@ -560,6 +570,41 @@ public class LuceneSerializerTest {
testQuery(gross.goe(900.10), "gross:[900.1 TO *]", 0);
}
@Test
public void Equals_Empty_String() throws Exception {
testQuery(title.eq(""), "title:", 0);
}
@Test
public void Not_Equals_Empty_String() throws Exception {
testQuery(title.ne(""), "-title:", 0);
}
@Test
public void Contains_Empty_String() throws Exception {
testQuery(title.contains(""), "title:**", 1);
}
@Test
public void Like_Empty_String() throws Exception {
testQuery(title.like(""), "title:", 0);
}
@Test
public void Starts_With_Empty_String() throws Exception {
testQuery(title.startsWith(""), "title:*", 1);
}
@Test
public void Ends_With_Empty_String() throws Exception {
testQuery(title.endsWith(""), "title:*", 1);
}
@Test
public void Between_Empty_Strings() throws Exception {
testQuery(title.between("", ""), "title:[ TO ]", 0);
}
@Test
public void booleanBuilder() throws Exception{
testQuery(new BooleanBuilder(gross.goe(900.10)), "gross:[900.1 TO *]", 0);