Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-10-31 06:38:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhancement for random Id of elasticsearch if an entity does not have one

Browse Source
This commit is contained in:
Mohsin Husen 2013-03-05 13:50:02 +00:00
parent e54b263be9
commit c689470cac
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,8 +261,16 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
String type = isBlank(query.getType())? String type = isBlank(query.getType())?
retrieveTypeFromPersistentEntity(query.getObject().getClass())[0] : query.getType(); retrieveTypeFromPersistentEntity(query.getObject().getClass())[0] : query.getType();
IndexRequestBuilder indexRequestBuilder = client.prepareIndex(indexName,type,query.getId()) IndexRequestBuilder indexRequestBuilder = null;
.setSource(objectMapper.writeValueAsString(query.getObject()));
if(query.getId() != null){
indexRequestBuilder = client.prepareIndex(indexName,type,query.getId());
}else {
indexRequestBuilder = client.prepareIndex(indexName,type);
}
indexRequestBuilder.setSource(objectMapper.writeValueAsString(query.getObject()));
if(query.getVersion() != null){ if(query.getVersion() != null){
indexRequestBuilder.setVersion(query.getVersion()); indexRequestBuilder.setVersion(query.getVersion());
indexRequestBuilder.setVersionType(EXTERNAL); indexRequestBuilder.setVersionType(EXTERNAL);

5
src/main/java/org/springframework/data/elasticsearch/repository/support/MappingElasticsearchEntityInformation.java
View File

@ -55,10 +55,13 @@ public class MappingElasticsearchEntityInformation<T, ID extends Serializable> e
public ID getId(T entity) { public ID getId(T entity) {
ElasticsearchPersistentProperty id = entityMetadata.getIdProperty(); ElasticsearchPersistentProperty id = entityMetadata.getIdProperty();
try { try {
return (ID) BeanWrapper.create(entity, null).getProperty(id); if(id != null){
return (ID) BeanWrapper.create(entity, null).getProperty(id);
}
} catch (Exception e) { } catch (Exception e) {
throw new IllegalStateException("ID could not be resolved", e); throw new IllegalStateException("ID could not be resolved", e);
} }
return null;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")