Move to Elasticsearch 0.21.0.Beta1

Due to refactoring in 0.21.x we have to update this plugin
Closes elastic#24.

Author: dadoonet

README.md

@@ -8,19 +8,19 @@ In order to install the plugin, simply run: `bin/plugin -install elasticsearch/e
     ------------------------------------------------------
     | Attachment Mapper Plugin | ElasticSearch    | Tika |
     ------------------------------------------------------
-    | master                   | 0.20 -> master   | 1.2  |
+    | master                   | 0.21 -> master   | 1.2  |
     ------------------------------------------------------
-    | 1.6.0                    | 0.19 -> master   | 1.2  |
+    | 1.6.0                    | 0.19 -> 0.20     | 1.2  |
     ------------------------------------------------------
-    | 1.5.0                    | 0.19 -> master   | 1.2  |
+    | 1.5.0                    | 0.19 -> 0.20     | 1.2  |
     ------------------------------------------------------
-    | 1.4.0                    | 0.19 -> master   | 1.1  |
+    | 1.4.0                    | 0.19 -> 0.20     | 1.1  |
     ------------------------------------------------------
-    | 1.3.0                    | 0.19 -> master   | 1.0  |
+    | 1.3.0                    | 0.19 -> 0.20     | 1.0  |
     ------------------------------------------------------
-    | 1.2.0                    | 0.19 -> master   | 1.0  |
+    | 1.2.0                    | 0.19 -> 0.20     | 1.0  |
     ------------------------------------------------------
-    | 1.1.0                    | 0.19 -> master   |      |
+    | 1.1.0                    | 0.19 -> 0.20     |      |
     ------------------------------------------------------
     | 1.0.0                    | 0.18             |      |
     ------------------------------------------------------

pom.xml

@@ -30,7 +30,7 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>0.20.1</elasticsearch.version>
+        <elasticsearch.version>0.21.0.Beta1-SNAPSHOT</elasticsearch.version>
     </properties>
 
     <repositories>
@@ -159,4 +159,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

src/test/java/org/elasticsearch/index/mapper/xcontent/SimpleAttachmentMapperTests.java

@@ -46,7 +46,7 @@ public class SimpleAttachmentMapperTests {
 
     @BeforeClass
     public void setupMapperParser() {
-        mapperParser = new DocumentMapperParser(new Index("test"), new AnalysisService(new Index("test")));
+        mapperParser = new DocumentMapperParser(new Index("test"), new AnalysisService(new Index("test")), null, null);
         mapperParser.putTypeParser(AttachmentMapper.CONTENT_TYPE, new AttachmentMapper.TypeParser());
     }
 

src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java

@@ -68,9 +68,9 @@ public void createIndex() {
         node.client().admin().indices().create(createIndexRequest("test").settings(settingsBuilder().put("index.numberOfReplicas", 0))).actionGet();
         logger.info("Running Cluster Health");
         ClusterHealthResponse clusterHealth = node.client().admin().cluster().health(clusterHealthRequest().waitForGreenStatus()).actionGet();
-        logger.info("Done Cluster Health, status " + clusterHealth.status());
-        assertThat(clusterHealth.timedOut(), equalTo(false));
-        assertThat(clusterHealth.status(), equalTo(ClusterHealthStatus.GREEN));
+        logger.info("Done Cluster Health, status " + clusterHealth.getStatus());
+        assertThat(clusterHealth.isTimedOut(), equalTo(false));
+        assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN));
     }
 
     @AfterMethod
@@ -91,10 +91,10 @@ public void testSimpleAttachment() throws Exception {
         node.client().admin().indices().refresh(refreshRequest()).actionGet();
 
         CountResponse countResponse = node.client().count(countRequest("test").query(fieldQuery("file.title", "test document"))).actionGet();
-        assertThat(countResponse.count(), equalTo(1l));
+        assertThat(countResponse.getCount(), equalTo(1l));
 
         countResponse = node.client().count(countRequest("test").query(fieldQuery("file", "tests the ability"))).actionGet();
-        assertThat(countResponse.count(), equalTo(1l));
+        assertThat(countResponse.getCount(), equalTo(1l));
     }
 
     @Test
@@ -110,10 +110,10 @@ public void testSimpleAttachmentContentLengthLimit() throws Exception {
         node.client().admin().indices().refresh(refreshRequest()).actionGet();
 
         CountResponse countResponse = node.client().count(countRequest("test").query(fieldQuery("file", "BeforeLimit"))).actionGet();
-        assertThat(countResponse.count(), equalTo(1l));
+        assertThat(countResponse.getCount(), equalTo(1l));
 
         countResponse = node.client().count(countRequest("test").query(fieldQuery("file", "AfterLimit"))).actionGet();
-        assertThat(countResponse.count(), equalTo(0l));
+        assertThat(countResponse.getCount(), equalTo(0l));
     }
 
     @Test
@@ -129,10 +129,10 @@ public void testSimpleAttachmentNoContentLengthLimit() throws Exception {
         node.client().admin().indices().refresh(refreshRequest()).actionGet();
 
         CountResponse countResponse = node.client().count(countRequest("test").query(fieldQuery("file", "Begin"))).actionGet();
-        assertThat(countResponse.count(), equalTo(1l));
+        assertThat(countResponse.getCount(), equalTo(1l));
 
         countResponse = node.client().count(countRequest("test").query(fieldQuery("file", "End"))).actionGet();
-        assertThat(countResponse.count(), equalTo(1l));
+        assertThat(countResponse.getCount(), equalTo(1l));
     }
 
     /**