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

DATAES-31 : Add the ability to index arbitrary JSON strings

Browse Source
This commit is contained in:
mohsin.husen
2013-11-23 14:58:19 +00:00
parent a833c89a69
commit 9386129bbf
3 changed files with 91 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -531,9 +531,16 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
String type = isBlank(query.getType()) ? retrieveTypeFromPersistentEntity(query.getObject().getClass())[0]
: query.getType();
IndexRequestBuilder indexRequestBuilder = client.prepareIndex(indexName, type, query.getId()).setSource(
resultsMapper.getEntityMapper().mapToString(query.getObject()));
IndexRequestBuilder indexRequestBuilder = null;
if(query.getObject() != null) {
indexRequestBuilder = client.prepareIndex(indexName, type, query.getId()).setSource(
resultsMapper.getEntityMapper().mapToString(query.getObject()));
} else if(query.getSource() != null) {
indexRequestBuilder = client.prepareIndex(indexName, type, query.getId()).setSource(query.getSource());
} else {
throw new ElasticsearchException("object or source is null, failed to index the document [id: " + query.getId() + "]");
}
if (query.getVersion() != null) {
indexRequestBuilder.setVersion(query.getVersion());
indexRequestBuilder.setVersionType(EXTERNAL);
@@ -544,16 +551,19 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
}
}
@Override
public void refresh(String indexName, boolean waitForOperation) {
client.admin().indices().refresh(refreshRequest(indexName).force(waitForOperation)).actionGet();
}
@Override
public <T> void refresh(Class<T> clazz, boolean waitForOperation) {
ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz);
client.admin().indices()
.refresh(refreshRequest(persistentEntity.getIndexName()).force(waitForOperation)).actionGet();
}
@Override
public Boolean addAlias(AliasQuery query) {
Assert.notNull(query.getIndexName(), "No index defined for Alias");
Assert.notNull(query.getAliasName(), "No alias defined");
@@ -568,6 +578,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
return indicesAliasesRequestBuilder.execute().actionGet().isAcknowledged();
}
@Override
public Boolean removeAlias(AliasQuery query) {
Assert.notNull(query.getIndexName(), "No index defined for Alias");
Assert.notNull(query.getAliasName(), "No alias defined");
@@ -575,6 +586,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
.execute().actionGet().isAcknowledged();
}
@Override
public Set<String> queryForAlias(String indexName) {
ClusterStateRequest clusterStateRequest = Requests.clusterStateRequest()
.filterRoutingTable(true)

9
src/main/java/org/springframework/data/elasticsearch/core/query/IndexQuery.java
View File

@@ -29,6 +29,7 @@ public class IndexQuery {
private Long version;
private String indexName;
private String type;
private String source;
public String getId() {
return id;
@@ -69,4 +70,12 @@ public class IndexQuery {
public void setType(String type) {
this.type = type;
}
public String getSource() {
return source;
}
public void setSource(String source) {
this.source = source;
}
}