diff --git a/jest-common/src/main/java/io/searchbox/fields/FieldStats.java b/jest-common/src/main/java/io/searchbox/fields/FieldStats.java index 9e5672256..fc1de457e 100644 --- a/jest-common/src/main/java/io/searchbox/fields/FieldStats.java +++ b/jest-common/src/main/java/io/searchbox/fields/FieldStats.java @@ -2,13 +2,13 @@ import io.searchbox.action.AbstractAction; import io.searchbox.action.GenericResultAbstractAction; +import io.searchbox.client.config.ElasticsearchVersion; import io.searchbox.params.Parameters; import java.util.HashMap; import java.util.Map; public class FieldStats extends GenericResultAbstractAction { - protected FieldStats(FieldStats.Builder builder) { super(builder); @@ -18,8 +18,6 @@ protected FieldStats(FieldStats.Builder builder) { fieldStatsBody.put("fields", builder.fields); this.payload = fieldStatsBody; - - setURI(buildURI()); } @Override @@ -28,8 +26,8 @@ public String getRestMethodName() { } @Override - protected String buildURI() { - String buildURI = super.buildURI(); + protected String buildURI(ElasticsearchVersion elasticsearchVersion) { + String buildURI = super.buildURI(elasticsearchVersion); if (buildURI.isEmpty()) return "_field_stats"; diff --git a/jest-common/src/test/java/io/searchbox/fields/FieldsStatsTest.java b/jest-common/src/test/java/io/searchbox/fields/FieldsStatsTest.java index 1b4bd3ccc..ac56766f3 100644 --- a/jest-common/src/test/java/io/searchbox/fields/FieldsStatsTest.java +++ b/jest-common/src/test/java/io/searchbox/fields/FieldsStatsTest.java @@ -1,6 +1,7 @@ package io.searchbox.fields; import com.google.gson.Gson; +import io.searchbox.client.config.ElasticsearchVersion; import org.junit.Test; import java.util.Collections; @@ -17,7 +18,7 @@ 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()); + assertEquals(INDEX + "/_field_stats", fieldStats.getURI(ElasticsearchVersion.V55)); assertEquals("{\"fields\":[\"" + TEST_FIELD + "\"]}", fieldStats.getData(new Gson())); } @@ -25,7 +26,7 @@ public void testBasicUriGeneration() { public void testBasicUriGenerationNoIndex() { FieldStats fieldStats = new FieldStats.Builder(FIELDS).build(); assertEquals("POST", fieldStats.getRestMethodName()); - assertEquals("_field_stats", fieldStats.getURI()); + assertEquals("_field_stats", fieldStats.getURI(ElasticsearchVersion.V55)); assertEquals("{\"fields\":[\"" + TEST_FIELD + "\"]}", fieldStats.getData(new Gson())); } @@ -33,7 +34,7 @@ public void testBasicUriGenerationNoIndex() { 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()); + assertEquals(INDEX + "/_field_stats?level=indices", fieldStats.getURI(ElasticsearchVersion.V55)); assertEquals("{\"fields\":[\"" + TEST_FIELD + "\"]}", fieldStats.getData(new Gson())); } }