dependency version update

zhengfengshaw · Jul 18, 2014 · 21da50d · 21da50d
1 parent 2c02ff6
commit 21da50d
Show file tree

Hide file tree

Showing 54 changed files with 81 additions and 80 deletions.
diff --git a/jest-common/src/main/java/io/searchbox/client/AbstractJestClient.java b/jest-common/src/main/java/io/searchbox/client/AbstractJestClient.java
@@ -52,8 +52,10 @@ public void setServers(Set<String> servers) {
     }
 
     public void shutdownClient() {
-        if (null != nodeChecker)
-            nodeChecker.stop();
+        if (null != nodeChecker) {
+            nodeChecker.stopAsync();
+            nodeChecker.awaitTerminated();
+        }
     }
 
     protected String getElasticSearchServer() {

diff --git a/jest-droid/src/main/java/com/searchly/jestdroid/JestClientFactory.java b/jest-droid/src/main/java/com/searchly/jestdroid/JestClientFactory.java
@@ -1,21 +1,18 @@
 package com.searchly.jestdroid;
 
-import io.searchbox.client.JestClient;
-import io.searchbox.client.config.discovery.NodeChecker;
-
-import java.util.LinkedHashSet;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import ch.boye.httpclientandroidlib.client.HttpClient;
 import ch.boye.httpclientandroidlib.conn.routing.HttpRoute;
 import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient;
 import ch.boye.httpclientandroidlib.impl.conn.PoolingClientConnectionManager;
 import ch.boye.httpclientandroidlib.params.CoreConnectionPNames;
-
 import com.google.gson.Gson;
+import io.searchbox.client.JestClient;
+import io.searchbox.client.config.discovery.NodeChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedHashSet;
+import java.util.Map;
 
 /**
  * @author cihat.keser
@@ -71,7 +68,8 @@ public JestClient getObject() {
                 log.info("Node Discovery Enabled...");
                 NodeChecker nodeChecker = new NodeChecker(droidClientConfig, client);
                 client.setNodeChecker(nodeChecker);
-                nodeChecker.startAndWait();
+                nodeChecker.startAsync();
+                nodeChecker.awaitRunning();
             } else {
                 log.info("Node Discovery Disabled...");
             }

diff --git a/jest/src/main/java/io/searchbox/client/JestClientFactory.java b/jest/src/main/java/io/searchbox/client/JestClientFactory.java
@@ -49,7 +49,8 @@ public JestClient getObject() {
                 log.info("Node Discovery Enabled...");
                 NodeChecker nodeChecker = new NodeChecker(httpClientConfig, client);
                 client.setNodeChecker(nodeChecker);
-                nodeChecker.startAndWait();
+                nodeChecker.startAsync();
+                nodeChecker.awaitRunning();
             } else {
                 log.info("Node Discovery Disabled...");
             }

diff --git a/jest/src/test/java/io/searchbox/client/JestClientFactoryIntegrationTest.java b/jest/src/test/java/io/searchbox/client/JestClientFactoryIntegrationTest.java
@@ -10,15 +10,15 @@
 /**
  * @author cihat keser
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numNodes = 0)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
 public class JestClientFactoryIntegrationTest extends ElasticsearchIntegrationTest {
 
     JestClientFactory factory = new JestClientFactory();
 
     @Test
     public void testDiscovery() throws InterruptedException {
         // wait for 3 active nodes
-        cluster().ensureAtLeastNumNodes(4);
+        cluster().ensureAtLeastNumDataNodes(4);
 
         factory.setHttpClientConfig(new HttpClientConfig
                 .Builder("http://localhost:9200")
@@ -37,7 +37,7 @@ public void testDiscovery() throws InterruptedException {
                 jestClient.getServers().size()
         );
 
-        cluster().ensureAtMostNumNodes(3);
+        cluster().ensureAtMostNumDataNodes(3);
 
         int numServers = 0;
         int retries = 0;

diff --git a/jest/src/test/java/io/searchbox/client/http/JestHttpClientProxyIntegrationTest.java b/jest/src/test/java/io/searchbox/client/http/JestHttpClientProxyIntegrationTest.java
@@ -26,7 +26,7 @@
 /**
  * @author cihat keser
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numNodes = 0)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
 public class JestHttpClientProxyIntegrationTest extends ElasticsearchIntegrationTest {
 
     private AtomicInteger numProxyRequests = new AtomicInteger(0);
@@ -112,7 +112,7 @@ private static void rollbackSystemProperty(String key, String value) {
 
     @Test
     public void testConnectionThroughDefaultProxy() throws IOException, ExecutionException, InterruptedException {
-        cluster().ensureAtLeastNumNodes(1);
+        cluster().ensureAtLeastNumDataNodes(1);
 
         factory.setHttpClientConfig(new HttpClientConfig
                 .Builder("http://localhost:9200")

diff --git a/jest/src/test/java/io/searchbox/cluster/HealthIntegrationTest.java b/jest/src/test/java/io/searchbox/cluster/HealthIntegrationTest.java
@@ -13,7 +13,7 @@
  */
 
 
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class HealthIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/cluster/NodesHotThreadsIntegrationTest.java b/jest/src/test/java/io/searchbox/cluster/NodesHotThreadsIntegrationTest.java
@@ -10,7 +10,7 @@
 /**
  * @author cihat keser
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 2)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 2)
 public class NodesHotThreadsIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/cluster/NodesInfoIntegrationTest.java b/jest/src/test/java/io/searchbox/cluster/NodesInfoIntegrationTest.java
@@ -10,7 +10,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class NodesInfoIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/cluster/NodesStatsIntegrationTest.java b/jest/src/test/java/io/searchbox/cluster/NodesStatsIntegrationTest.java
@@ -15,7 +15,7 @@
 /**
  * @author cihat keser
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 2)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 2)
 public class NodesStatsIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/cluster/StateIntegrationTest.java b/jest/src/test/java/io/searchbox/cluster/StateIntegrationTest.java
@@ -12,7 +12,7 @@
 /**
  * @author cihat keser
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class StateIntegrationTest extends AbstractIntegrationTest {
 
     @Before

diff --git a/jest/src/test/java/io/searchbox/common/CommonIntegrationTest.java b/jest/src/test/java/io/searchbox/common/CommonIntegrationTest.java
@@ -12,7 +12,7 @@
  * @author ferhat
  */
 
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class CommonIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/BulkIntegrationTest.java b/jest/src/test/java/io/searchbox/core/BulkIntegrationTest.java
@@ -23,7 +23,7 @@
  * @author Dogukan Sonmez
  */
 
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 1)
 public class BulkIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/CountIntegrationTest.java b/jest/src/test/java/io/searchbox/core/CountIntegrationTest.java
@@ -11,7 +11,7 @@
  * @author Dogukan Sonmez
  * @author cihat keser
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 @FixMethodOrder
 public class CountIntegrationTest extends AbstractIntegrationTest {
 

diff --git a/jest/src/test/java/io/searchbox/core/DeleteByQueryIntegrationTest.java b/jest/src/test/java/io/searchbox/core/DeleteByQueryIntegrationTest.java
@@ -11,7 +11,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class DeleteByQueryIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/DeleteIntegrationTest.java b/jest/src/test/java/io/searchbox/core/DeleteIntegrationTest.java
@@ -17,7 +17,7 @@
  */
 
 
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class DeleteIntegrationTest extends AbstractIntegrationTest {
 
     private final static Logger log = LoggerFactory.getLogger(DeleteIntegrationTest.class);

diff --git a/jest/src/test/java/io/searchbox/core/ExplainIntegrationTest.java b/jest/src/test/java/io/searchbox/core/ExplainIntegrationTest.java
@@ -14,7 +14,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class ExplainIntegrationTest extends AbstractIntegrationTest {
 
     final static Logger log = LoggerFactory.getLogger(ExplainIntegrationTest.class);

diff --git a/jest/src/test/java/io/searchbox/core/GetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/GetIntegrationTest.java
@@ -15,7 +15,7 @@
  * @author Dogukan Sonmez
  * @author cihat keser
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class GetIntegrationTest extends AbstractIntegrationTest {
 
     @Before

diff --git a/jest/src/test/java/io/searchbox/core/IndexIntegrationTest.java b/jest/src/test/java/io/searchbox/core/IndexIntegrationTest.java
@@ -17,7 +17,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class IndexIntegrationTest extends AbstractIntegrationTest {
 
     public static final String INDEX_NAME = "twitter";

diff --git a/jest/src/test/java/io/searchbox/core/MoreLikeThisIntegrationTest.java b/jest/src/test/java/io/searchbox/core/MoreLikeThisIntegrationTest.java
@@ -11,7 +11,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class MoreLikeThisIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/MultiGetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/MultiGetIntegrationTest.java
@@ -15,7 +15,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class MultiGetIntegrationTest extends AbstractIntegrationTest {
 
     @Before

diff --git a/jest/src/test/java/io/searchbox/core/MultiSearchIntegrationTest.java b/jest/src/test/java/io/searchbox/core/MultiSearchIntegrationTest.java
@@ -11,7 +11,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class MultiSearchIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/PercolateIntegrationTest.java b/jest/src/test/java/io/searchbox/core/PercolateIntegrationTest.java
@@ -11,7 +11,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class PercolateIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/SearchIntegrationTest.java b/jest/src/test/java/io/searchbox/core/SearchIntegrationTest.java
@@ -20,7 +20,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class SearchIntegrationTest extends AbstractIntegrationTest {
 
     String query = "{\n" +

diff --git a/jest/src/test/java/io/searchbox/core/SearchScrollIntegrationTest.java b/jest/src/test/java/io/searchbox/core/SearchScrollIntegrationTest.java
@@ -16,7 +16,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 2)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 2)
 public class SearchScrollIntegrationTest extends AbstractIntegrationTest {
 
     private static final String INDEX_NAME = "scroll_index";

diff --git a/jest/src/test/java/io/searchbox/core/UpdateIntegrationTest.java b/jest/src/test/java/io/searchbox/core/UpdateIntegrationTest.java
@@ -12,7 +12,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class UpdateIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/ValidateIntegrationTest.java b/jest/src/test/java/io/searchbox/core/ValidateIntegrationTest.java
@@ -13,7 +13,7 @@
 /**
  * @author Dogukan Sonmez
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class ValidateIntegrationTest extends AbstractIntegrationTest {
 
     @Before

diff --git a/jest/src/test/java/io/searchbox/core/search/facet/DateHistogramFacetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/facet/DateHistogramFacetIntegrationTest.java
@@ -15,7 +15,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class DateHistogramFacetIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/search/facet/FilterFacetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/facet/FilterFacetIntegrationTest.java
@@ -13,7 +13,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class FilterFacetIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/search/facet/GeoDistanceFacetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/facet/GeoDistanceFacetIntegrationTest.java
@@ -14,7 +14,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class GeoDistanceFacetIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/search/facet/HistogramFacetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/facet/HistogramFacetIntegrationTest.java
@@ -14,7 +14,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class HistogramFacetIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/search/facet/QueryFacetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/facet/QueryFacetIntegrationTest.java
@@ -13,7 +13,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class QueryFacetIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/search/facet/RangeFacetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/facet/RangeFacetIntegrationTest.java
@@ -14,7 +14,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class RangeFacetIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/search/facet/StatisticalFacetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/facet/StatisticalFacetIntegrationTest.java
@@ -14,7 +14,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class StatisticalFacetIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/search/facet/TermsFacetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/facet/TermsFacetIntegrationTest.java
@@ -16,7 +16,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class TermsFacetIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/search/facet/TermsStatsFacetIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/facet/TermsStatsFacetIntegrationTest.java
@@ -14,7 +14,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class TermsStatsFacetIntegrationTest extends AbstractIntegrationTest {
 
     @Test

diff --git a/jest/src/test/java/io/searchbox/core/search/sort/SortIntegrationTest.java b/jest/src/test/java/io/searchbox/core/search/sort/SortIntegrationTest.java
@@ -16,7 +16,7 @@
 /**
  * @author ferhat
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class SortIntegrationTest extends AbstractIntegrationTest {
 
     String query = "{\"query\":{ \"match_all\" : { }}}";

diff --git a/jest/src/test/java/io/searchbox/indices/AnalyzeIntegrationTest.java b/jest/src/test/java/io/searchbox/indices/AnalyzeIntegrationTest.java
@@ -18,7 +18,7 @@
 /**
  * @author cihat keser
  */
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
 public class AnalyzeIntegrationTest extends AbstractIntegrationTest {
 
     private static String sample_book;
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
      */
-    @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numNodes = 1)
+    @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1)
     public class HealthIntegrationTest extends AbstractIntegrationTest {
         @Test
@@ Expand Down @@