Skip to content

Changes to make querydsl-elasticsearch work with latest elasticsearch #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Changes to make querydsl-elasticsearch work with latest elasticsearch #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a308d5
This change contains
Dec 31, 2015
eaa539b
fixed the checkstyle-plugin errors
Dec 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions querydsl-elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</scm>

<properties>
<elasticsearch.version>1.3.4</elasticsearch.version>
<jackson.version>2.4.2</jackson.version>
<elasticsearch.version>2.1.0</elasticsearch.version>
<jackson.version>2.6.3</jackson.version>
<osgi.import.package>
org.elasticsearch.*;version="0.0.0",
com.fasterxml.jackson.core.*;version="0.0.0",
Expand Down
22 changes: 13 additions & 9 deletions querydsl-elasticsearch/src/main/java/com/querydsl/elasticsearch/ElasticsearchSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ public Object visit(Operation<?> expr, @Nullable BoolQueryBuilder context) {
} else {
// Currently all queries are made with ignore case sensitive
// Because the query to get exact value have to be run on a not_analyzed field
return QueryBuilders.queryString(value).field(asDBKey(expr, 0));
return QueryBuilders.queryStringQuery(value).field(asDBKey(expr, 0));
}

} else if (op == Ops.EQ_IGNORE_CASE) {
String value = StringUtils.toString(asDBValue(expr, 1));
return QueryBuilders.queryString(value).field(asDBKey(expr, 0));
return QueryBuilders.queryStringQuery(value).field(asDBKey(expr, 0));

} else if (op == Ops.NE) {
// Decompose the query as NOT and EQ query
Expand All @@ -112,7 +112,7 @@ public Object visit(Operation<?> expr, @Nullable BoolQueryBuilder context) {
context);

} else if (op == Ops.STRING_IS_EMPTY) {
return QueryBuilders.queryString("").field(asDBKey(expr, 0));
return QueryBuilders.queryStringQuery("").field(asDBKey(expr, 0));

} else if (op == Ops.AND || op == Ops.OR) {
Operation<?> left = (Operation<?>) expr.getArg(0);
Expand Down Expand Up @@ -156,7 +156,7 @@ public Object visit(Operation<?> expr, @Nullable BoolQueryBuilder context) {
if (Collection.class.isAssignableFrom(expr.getArg(constIndex).getType())) {
Collection<?> values = (Collection<?>) ((Constant<?>) expr.getArg(constIndex)).getConstant();
for (Object value : values) {
boolQuery.should(QueryBuilders.queryString(StringUtils.toString(value)).field(key));
boolQuery.should(QueryBuilders.queryStringQuery(StringUtils.toString(value)).field(key));
}
return boolQuery;

Expand Down Expand Up @@ -193,24 +193,28 @@ public Object visit(Operation<?> expr, @Nullable BoolQueryBuilder context) {
} else if (op == Ops.STARTS_WITH) {
// Currently all queries are made with ignore case sensitive
String value = StringUtils.toString(asDBValue(expr, 1));
return QueryBuilders.queryString(value + "*").field(asDBKey(expr, 0)).analyzeWildcard(true);
return QueryBuilders.queryStringQuery(value + "*").field(asDBKey(expr, 0)).analyzeWildcard(true);

} else if (op == Ops.STARTS_WITH_IC) {
String value = StringUtils.toString(asDBValue(expr, 1));
return QueryBuilders.queryString(value + "*").field(asDBKey(expr, 0)).analyzeWildcard(true);
return QueryBuilders.queryStringQuery(value + "*").field(asDBKey(expr, 0)).analyzeWildcard(true);

} else if (op == Ops.ENDS_WITH) {
// Currently all queries are made with ignore case sensitive
String value = StringUtils.toString(asDBValue(expr, 1));
return QueryBuilders.queryString("*" + value).field(asDBKey(expr, 0)).analyzeWildcard(true);
return QueryBuilders.queryStringQuery("*" + value).field(asDBKey(expr, 0)).analyzeWildcard(true);

} else if (op == Ops.ENDS_WITH_IC) {
String value = StringUtils.toString(asDBValue(expr, 1));
return QueryBuilders.queryString("*" + value).field(asDBKey(expr, 0)).analyzeWildcard(true);
return QueryBuilders.queryStringQuery("*" + value).field(asDBKey(expr, 0)).analyzeWildcard(true);

} else if (op == Ops.STRING_CONTAINS) {
String value = StringUtils.toString(asDBValue(expr, 1));
return QueryBuilders.queryString("*" + value + "*").field(asDBKey(expr, 0)).analyzeWildcard(true);
return QueryBuilders.queryStringQuery("*" + value + "*").field(asDBKey(expr, 0)).analyzeWildcard(true);

} else if (op == Ops.STRING_CONTAINS_IC) {
String value = StringUtils.toString(asDBValue(expr, 1));
return QueryBuilders.queryStringQuery("*" + value + "*").field(asDBKey(expr, 0)).analyzer("standard").analyzeWildcard(true);

} else if (op == Ops.NOT) {
// Handle the not's child
Expand Down
19 changes: 16 additions & 3 deletions querydsl-elasticsearch/src/test/java/com/querydsl/elasticsearch/ElasticsearchQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static java.util.Arrays.asList;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
import static org.elasticsearch.client.Requests.refreshRequest;
import static org.junit.Assert.*;

Expand All @@ -16,7 +17,7 @@
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.node.Node;
import org.elasticsearch.node.NodeBuilder;
import org.junit.Before;
Expand Down Expand Up @@ -52,7 +53,9 @@ public ElasticsearchQueryTest() {

@BeforeClass
public static void beforeClass() {
ImmutableSettings.Builder settings = ImmutableSettings.builder().put("path.data", ElasticsearchQueryTest.class.getResource("").getPath());
String path = ElasticsearchQueryTest.class.getResource("").getPath();
path = System.getProperty("os.name").contains("indow") ? path.substring(1) : path;
Settings.Builder settings = Settings.builder().put("path.home",path);
Node node = NodeBuilder.nodeBuilder().local(true).settings(settings).node();
client = node.client();

Expand Down Expand Up @@ -117,6 +120,16 @@ public void NotContains() {
//assertQuery(user.friends.contains(u1).not(), u1);
}

@Test
public void Contains_Ignore_Case() {
assertTrue(where(user.firstName.containsIgnoreCase("akk")).fetchCount() > 0);
}

@Test
public void Contains_Ignore_Case_2() {
assertFalse(where(user.firstName.containsIgnoreCase("xyzzz")).fetchCount() > 0);
}

@Test
public void Equals_Ignore_Case() {
assertTrue(where(user.firstName.equalsIgnoreCase("jAaKko")).fetchCount() > 0);
Expand Down Expand Up @@ -295,7 +308,7 @@ public boolean createIndex(String index) {
}

public void refresh(String indexName, boolean waitForOperation) {
client.admin().indices().refresh(refreshRequest(indexName).force(waitForOperation)).actionGet();
client.admin().indices().refresh(refreshRequest(indexName)).actionGet();
}

}
2 changes: 1 addition & 1 deletion ...l-elasticsearch/src/test/java/com/querydsl/elasticsearch/ElasticsearchSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public void EqAndEqOrEqAndEq() {
}

public static QueryBuilder eq(String key, Object value) {
return QueryBuilders.queryString(StringUtils.toString(value)).field(key);
return QueryBuilders.queryStringQuery(StringUtils.toString(value)).field(key);
}

public static QueryBuilder in(String key, Iterable<?> values) {
Expand Down