Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-24 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded the elasticsearch version to 0.90.9

Browse Source
This commit is contained in:
Rizwan Idrees 2013-12-26 10:01:58 +00:00
parent 2a772d553a
commit afc6349dec
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -24,7 +24,7 @@
<commonscollections>3.2.1</commonscollections> <commonscollections>3.2.1</commonscollections>
<commonslang>2.6</commonslang> <commonslang>2.6</commonslang>
<elasticsearch>0.90.6</elasticsearch> <elasticsearch>0.90.9</elasticsearch>
<jackson>2.2.3</jackson> <jackson>2.2.3</jackson>
<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons> <springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>

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

@ -34,6 +34,8 @@ import org.elasticsearch.action.update.UpdateRequestBuilder;
import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.Client; import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests; import org.elasticsearch.client.Requests;
import org.elasticsearch.cluster.metadata.MappingMetaData;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.collect.MapBuilder;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
@ -57,11 +59,7 @@ import org.springframework.data.elasticsearch.core.query.*;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
import static org.apache.commons.lang.StringUtils.isBlank; import static org.apache.commons.lang.StringUtils.isBlank;
@ -70,6 +68,7 @@ import static org.elasticsearch.action.search.SearchType.DFS_QUERY_THEN_FETCH;
import static org.elasticsearch.action.search.SearchType.SCAN; import static org.elasticsearch.action.search.SearchType.SCAN;
import static org.elasticsearch.client.Requests.indicesExistsRequest; import static org.elasticsearch.client.Requests.indicesExistsRequest;
import static org.elasticsearch.client.Requests.refreshRequest; import static org.elasticsearch.client.Requests.refreshRequest;
import static org.elasticsearch.common.collect.Sets.newHashSet;
import static org.elasticsearch.index.VersionType.EXTERNAL; import static org.elasticsearch.index.VersionType.EXTERNAL;
import static org.springframework.data.elasticsearch.core.MappingBuilder.buildMapping; import static org.springframework.data.elasticsearch.core.MappingBuilder.buildMapping;
@ -306,7 +305,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
@Override @Override
public void deleteType(String index, String type) { public void deleteType(String index, String type) {
Map mappings = client.admin().cluster().prepareState().execute().actionGet() ImmutableOpenMap<String, MappingMetaData> mappings = client.admin().cluster().prepareState().execute().actionGet()
.getState().metaData().index(index).mappings(); .getState().metaData().index(index).mappings();
if (mappings.containsKey(type)) { if (mappings.containsKey(type)) {
client.admin().indices().deleteMapping(new DeleteMappingRequest(index).type(type)).actionGet(); client.admin().indices().deleteMapping(new DeleteMappingRequest(index).type(type)).actionGet();
@ -592,7 +591,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations {
.filterRoutingTable(true) .filterRoutingTable(true)
.filterNodes(true) .filterNodes(true)
.filteredIndices(indexName); .filteredIndices(indexName);
return client.admin().cluster().state(clusterStateRequest).actionGet().getState().getMetaData().aliases().keySet(); Iterator<String> iterator = client.admin().cluster().state(clusterStateRequest).actionGet().getState().getMetaData().aliases().keysIt();
return newHashSet(iterator);
} }
private ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) { private ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {