Fix compile errors after backport of #32403

elastic · Aug 10, 2018 · 486c507 · 486c507
1 parent 10f5ffb
commit 486c507
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...rent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java b/...rent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java
@@ -57,9 +57,9 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
     }
 
     @Override
-    protected Settings indexSettings() {
+    protected Settings createTestIndexSettings() {
         return Settings.builder()
-            .put(super.indexSettings())
+            .put(super.createTestIndexSettings())
             .put("index.version.created", Version.V_5_6_0) // legacy needs multi type
             .build();
     }

diff --git a/...les/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java b/...les/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java
@@ -255,7 +255,7 @@ public void testRequiredParameters() {
     public void testFromJsonNoDocumentType() throws IOException {
         QueryShardContext queryShardContext = createShardContext();
         QueryBuilder queryBuilder = parseQuery("{\"percolate\" : { \"document\": {}, \"field\":\"" + queryField + "\"}}");
-        if (indexVersionCreated.before(Version.V_6_0_0_alpha1)) {
+        if (indexSettings().getIndexVersionCreated().before(Version.V_6_0_0_alpha1)) {
             IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
                 () -> queryBuilder.toQuery(queryShardContext));
             assertThat(e.getMessage(), equalTo("[percolate] query is missing required [document_type] parameter"));