delete by query is now a plugin

https://www.elastic.co/guide/en/elasticsearch/plugins/2.0/plugins-delete-by-query.html

solving jar hell with junit, mockito and hamcrest.

upgrading to es2, rc1.

jest-common/pom.xml

@@ -68,6 +68,11 @@
             <artifactId>junit</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -97,7 +102,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 

jest-droid/pom.xml

@@ -102,7 +102,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
 

jest/pom.xml

@@ -123,10 +123,14 @@
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.plugin</groupId>
+            <artifactId>delete-by-query</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
         </dependency>
 
         <dependency>

jest/src/test/java/io/searchbox/common/AbstractIntegrationTest.java

@@ -6,6 +6,7 @@
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.Node;
+import org.elasticsearch.plugin.deletebyquery.DeleteByQueryPlugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.junit.After;
 import org.junit.Before;
@@ -33,6 +34,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
                 .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
                 .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1)
                 .put(Node.HTTP_ENABLED, true)
+                .put("plugin.types", DeleteByQueryPlugin.class.getName())
                 .build();
     }
 

jest/src/test/java/io/searchbox/core/DeleteByQueryIntegrationTest.java

@@ -1,11 +1,18 @@
 package io.searchbox.core;
 
+import com.google.common.base.Predicate;
 import io.searchbox.client.JestResult;
 import io.searchbox.common.AbstractIntegrationTest;
+import org.elasticsearch.index.engine.Engine;
+import org.elasticsearch.plugin.deletebyquery.DeleteByQueryPlugin;
+import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
 
 /**
  * @author Dogukan Sonmez
@@ -14,25 +21,52 @@
 public class DeleteByQueryIntegrationTest extends AbstractIntegrationTest {
 
     @Test
-    public void delete() throws IOException {
-        String query = "{\n" +
-                "    \"query\" : {\n" +
-                "        \"term\" : { \"user\" : \"kimchy\" }\n" +
+    public void delete() throws IOException, InterruptedException {
+        final String query = "{\n" +
+                "    \"query\": {\n" +
+                "        \"term\": { \"user\" : \"kimchy\" }\n" +
                 "    }\n" +
                 "}";
-        client.execute(new Index.Builder("\"user\":\"kimchy\"").index("twitter").type("tweet").id("1").build());
+        client.execute(new Index.Builder("{\"user\":\"kimchy\"}").index("twitter").type("tweet").id("1").build());
+
+        waitForDocumentToBeIndexed(query);
+
+        Thread.sleep(1000);
+
         DeleteByQuery deleteByQuery = new DeleteByQuery.Builder(query)
                 .addIndex("twitter")
                 .addType("tweet")
                 .build();
 
         JestResult result = client.execute(deleteByQuery);
-        assertTrue(result.getErrorMessage(), result.isSucceeded());;
+        assertTrue(result.getErrorMessage(), result.isSucceeded());
 
         assertEquals(
                 0,
-                result.getJsonObject().getAsJsonObject("_indices").getAsJsonObject("twitter").getAsJsonObject("_shards").get("failed").getAsInt()
+                result.getJsonObject().getAsJsonObject("_indices").getAsJsonObject("twitter").get("failed").getAsInt()
         );
+        assertEquals(
+                1,
+                result.getJsonObject().getAsJsonObject("_indices").getAsJsonObject("twitter").get("deleted").getAsInt()
+        );
+    }
+
+    private void waitForDocumentToBeIndexed(final String query) throws InterruptedException {
+        awaitBusy(new Predicate<Object>() {
+            @Override
+            public boolean apply(Object input) {
+                try {
+                    SearchResult searchResult = client.execute(new Search.Builder(query)
+                            .addIndex("twitter")
+                            .addType("tweet")
+                            .build());
+                    System.out.println(searchResult.getJsonString());
+                    return null != searchResult.getFirstHit(Map.class);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
     }
 
 }

pom.xml

@@ -68,7 +68,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <elasticsearch.version>2.0.0-beta1</elasticsearch.version>
+        <elasticsearch.version>2.0.0-rc1</elasticsearch.version>
 
         <lucene.version>5.2.1</lucene.version>
         <hamcrest.version>1.3</hamcrest.version>
@@ -155,6 +155,7 @@
                     <maxmem>256m</maxmem>
                     <!-- aggregated reports for multi-module projects -->
                     <aggregate>true</aggregate>
+                    <check/>
                 </configuration>
             </plugin>
 
@@ -254,6 +255,12 @@
                 <artifactId>junit</artifactId>
                 <version>${junit.version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.hamcrest</groupId>
+                        <artifactId>hamcrest-core</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -269,12 +276,24 @@
                 <version>${elasticsearch.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.elasticsearch.plugin</groupId>
+                <artifactId>delete-by-query</artifactId>
+                <version>${elasticsearch.version}</version>
+                <scope>test</scope>
+            </dependency>
 
             <dependency>
                 <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
+                <artifactId>mockito-core</artifactId>
                 <version>${mockito.version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>hamcrest-core</artifactId>
+                        <groupId>org.hamcrest</groupId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>