fix

yaozd · Apr 12, 2018 · 2cb85cb · 2cb85cb
1 parent aeb0edc
commit 2cb85cb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/jest-common/src/test/java/io/searchbox/core/CatRecoveryBuilderTest.java b/jest-common/src/test/java/io/searchbox/core/CatRecoveryBuilderTest.java
@@ -5,9 +5,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-/**
- * @author Bartosz Polnik
- */
 public class CatRecoveryBuilderTest {
     @Test
     public void shouldSetApplicationJsonHeader() {

diff --git a/jest-common/src/test/java/io/searchbox/fields/FieldsStatsTest.java b/jest-common/src/test/java/io/searchbox/fields/FieldsStatsTest.java
@@ -18,23 +18,23 @@ public class FieldsStatsTest {
     public void testBasicUriGeneration() {
         FieldStats fieldStats = new FieldStats.Builder(FIELDS).setIndex(INDEX).build();
         assertEquals("POST", fieldStats.getRestMethodName());
-        assertEquals(INDEX + "/_field_stats", fieldStats.getURI(ElasticsearchVersion.V55));
+        assertEquals(INDEX + "/_field_stats", fieldStats.getURI(ElasticsearchVersion.UNKNOWN));
         assertEquals("{\"fields\":[\"" + TEST_FIELD + "\"]}", fieldStats.getData(new Gson()));
     }
 
     @Test
     public void testBasicUriGenerationNoIndex() {
         FieldStats fieldStats = new FieldStats.Builder(FIELDS).build();
         assertEquals("POST", fieldStats.getRestMethodName());
-        assertEquals("_field_stats", fieldStats.getURI(ElasticsearchVersion.V55));
+        assertEquals("_field_stats", fieldStats.getURI(ElasticsearchVersion.UNKNOWN));
         assertEquals("{\"fields\":[\"" + TEST_FIELD + "\"]}", fieldStats.getData(new Gson()));
     }
 
     @Test
     public void testBasicUriGenerationWithLevel() {
         FieldStats fieldStats = new FieldStats.Builder(FIELDS).setIndex(INDEX).setLevel("indices").build();
         assertEquals("POST", fieldStats.getRestMethodName());
-        assertEquals(INDEX + "/_field_stats?level=indices", fieldStats.getURI(ElasticsearchVersion.V55));
+        assertEquals(INDEX + "/_field_stats?level=indices", fieldStats.getURI(ElasticsearchVersion.UNKNOWN));
         assertEquals("{\"fields\":[\"" + TEST_FIELD + "\"]}", fieldStats.getData(new Gson()));
     }
 }
diff --git a/jest/src/test/java/io/searchbox/core/CatIntegrationTest.java b/jest/src/test/java/io/searchbox/core/CatIntegrationTest.java
@@ -83,19 +83,19 @@ public void shouldDisplayRecoveryForSingleResult() throws IOException, JSONExcep
 
         CatResult result = client.execute(new Cat.RecoveryBuilder().addIndex(INDEX).setParameter("h", "index,stage").build());
 
-        ArrayList<String[]> expectedsPlainText = new ArrayList<>();
-        ArrayList<String> recovertResponsePerShared = new ArrayList<>();
+        ArrayList<String[]> expectedPlainText = new ArrayList<>();
+        ArrayList<String> recoveryResponsePerShared = new ArrayList<>();
 
         String expectedLine = "{\"index\":\"catintegrationindex\",\"stage\":\"done\"}";
-        expectedsPlainText.add(new String[]{"index", "stage"});
+        expectedPlainText.add(new String[]{"index", "stage"});
 
         IntStream.range(0, getNumShards(INDEX).totalNumShards).forEach(value -> {
-            expectedsPlainText.add(new String[]{INDEX, "done"});
-            recovertResponsePerShared.add(expectedLine);
+            expectedPlainText.add(new String[]{INDEX, "done"});
+            recoveryResponsePerShared.add(expectedLine);
         });
-        assertArrayEquals(expectedsPlainText.toArray(), result.getPlainText());
+        assertArrayEquals(expectedPlainText.toArray(), result.getPlainText());
 
-        String expectedSourceAsString = "[" + String.join(",", recovertResponsePerShared) + "]";
+        String expectedSourceAsString = "[" + String.join(",", recoveryResponsePerShared) + "]";
 
         JSONAssert.assertEquals(expectedSourceAsString, result.getSourceAsString(), false);
     }

diff --git a/jest/src/test/java/io/searchbox/fields/FieldStatsIntegrationTest.java b/jest/src/test/java/io/searchbox/fields/FieldStatsIntegrationTest.java
@@ -16,10 +16,10 @@
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 1)
 public class FieldStatsIntegrationTest  extends AbstractIntegrationTest {
 
-    static final String INDEX = "twitter";
-    static final String TYPE = "tweet";
-    static final String TEST_FIELD = "test_name";
-    static final List FIELDS = Collections.singletonList(TEST_FIELD);
+    private static final String INDEX = "twitter";
+    private static final String TYPE = "tweet";
+    private static final String TEST_FIELD = "test_name";
+    private static final List FIELDS = Collections.singletonList(TEST_FIELD);
 
     @Test
     public void testFieldStats() throws IOException {