Updating to work with elasticsearch v0.90.8

Author: juliakreger

Diff for: src/main/java/crate/elasticsearch/export/Exporter.java

@@ -1,6 +1,7 @@
 package crate.elasticsearch.export;
 
 import crate.elasticsearch.action.export.ExportContext;
+
 import org.apache.lucene.search.Query;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
@@ -9,6 +10,7 @@
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
+import org.elasticsearch.common.hppc.cursors.ObjectCursor;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.common.logging.ESLogger;
@@ -159,10 +161,10 @@ private void writeSettingsOrMappings(ExportContext context) {
                 builder.startObject(indexMetaData.index(), XContentBuilder.FieldCaseConversion.NONE);
                 Set<String> types = new HashSet<String>(Arrays.asList(context.types()));
                 boolean noTypes = types.isEmpty();
-                for (MappingMetaData mappingMetaData : indexMetaData.mappings().values()) {
-                    if (noTypes || types.contains(mappingMetaData.type())) {
-                        builder.field(mappingMetaData.type());
-                        builder.map(mappingMetaData.sourceAsMap());
+                for (ObjectCursor<MappingMetaData> mappingMetaData : indexMetaData.mappings().values()) {
+                    if (noTypes || types.contains(mappingMetaData.value.type())) {
+                        builder.field(mappingMetaData.value.type());
+                        builder.map(mappingMetaData.value.sourceAsMap());
                     }
                 }
                 builder.endObject();

Diff for: src/main/java/crate/elasticsearch/import_/Importer.java

@@ -32,7 +32,7 @@
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
-import org.elasticsearch.common.collect.ImmutableMap;
+import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.common.settings.ImmutableSettings;
@@ -355,22 +355,22 @@ private void loadMappings(File file, Map<String, Set<String>> createdMappings, S
 
     private Set<String> getMissingIndexes(Set<String> indexes) {
         try {
-            ImmutableMap<String, IndexMetaData> foundIndices = getIndexMetaData(indexes);
-            indexes.removeAll(foundIndices.keySet());
+            ImmutableOpenMap<String, IndexMetaData> foundIndices = getIndexMetaData(indexes);
+            indexes.remove(foundIndices.keys().toArray(String.class));
         } catch (IndexMissingException e) {
             // all indexes are missing
         }
         return indexes;
     }
 
-    private ImmutableMap<String, IndexMetaData> getIndexMetaData(Set<String> indexes) {
+    private ImmutableOpenMap<String, IndexMetaData> getIndexMetaData(Set<String> indexes) {
         ClusterStateRequest clusterStateRequest = Requests.clusterStateRequest()
                 .filterRoutingTable(true)
                 .filterNodes(true)
                 .filteredIndices(indexes.toArray(new String[indexes.size()]));
         clusterStateRequest.listenerThreaded(false);
         ClusterStateResponse response = client.admin().cluster().state(clusterStateRequest).actionGet();
-        return ImmutableMap.copyOf(response.getState().metaData().indices());
+        return response.getState().metaData().indices();
     }
 
 

Diff for: src/test/java/crate/elasticsearch/module/import_/test/RestImportActionTest.java

@@ -18,7 +18,7 @@
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
-import org.elasticsearch.common.collect.ImmutableMap;
+import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.junit.Test;
 
 import crate.elasticsearch.action.export.ExportAction;
@@ -326,8 +326,8 @@ public void testMappings() {
         executeImportRequest("{\"directory\": \"" + path + "\", \"mappings\": true}");
 
         ClusterStateRequest clusterStateRequest = Requests.clusterStateRequest().filteredIndices("index1");
-        ImmutableMap<String, MappingMetaData> mappings = ImmutableMap.copyOf(
-            esSetup.client().admin().cluster().state(clusterStateRequest).actionGet().getState().metaData().index("index1").getMappings());
+        ImmutableOpenMap<String, MappingMetaData> mappings = 
+            esSetup.client().admin().cluster().state(clusterStateRequest).actionGet().getState().metaData().index("index1").getMappings();
         assertEquals("{\"1\":{\"_timestamp\":{\"enabled\":true,\"store\":true},\"_ttl\":{\"enabled\":true,\"default\":86400000},\"properties\":{\"name\":{\"type\":\"string\",\"store\":true}}}}",
                 mappings.get("1").source().toString());
     }