Spring/spring-data-elasticsearch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAES-28 : Upgrade to elasticsearch 0.90.5

Browse Source
This commit is contained in:
Mohsin Husen
2013-10-30 14:02:50 +00:00
parent 2305fc873e
commit 95579d11ac
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
View File

@@ -241,7 +241,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
UpdateRequestBuilder updateRequestBuilder = client.prepareUpdate(indexName, type, query.getId());
if(query.DoUpsert()){
updateRequestBuilder.setDocAsUpsert(true)
.setUpsertRequest(query.getIndexRequest()).setDoc(query.getIndexRequest());
.setUpsert(query.getIndexRequest()).setDoc(query.getIndexRequest());
} else {
updateRequestBuilder.setDoc(query.getIndexRequest());
}
@@ -522,13 +522,13 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
}
public void refresh(String indexName, boolean waitForOperation) {
client.admin().indices().refresh(refreshRequest(indexName).waitForOperations(waitForOperation)).actionGet();
client.admin().indices().refresh(refreshRequest(indexName).force(waitForOperation)).actionGet();
}
public <T> void refresh(Class<T> clazz, boolean waitForOperation) {
ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz);
client.admin().indices()
.refresh(refreshRequest(persistentEntity.getIndexName()).waitForOperations(waitForOperation)).actionGet();
.refresh(refreshRequest(persistentEntity.getIndexName()).force(waitForOperation)).actionGet();
}
private ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {