Get rid of "unused variable" warnings

modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenIT.java

@@ -91,7 +91,7 @@ public void setupCluster() throws Exception {
                 String category = categories[j] = uniqueCategories[catIndex++ % uniqueCategories.length];
                 Control control = categoryToControl.get(category);
                 if (control == null) {
-                    categoryToControl.put(category, control = new Control(category));
+                    categoryToControl.put(category, control = new Control());
                 }
                 control.articleIds.add(id);
             }
@@ -457,13 +457,8 @@ public void testPostCollectAllLeafReaders() throws Exception {
     }
 
     private static final class Control {
-
         final Set<String> articleIds = new HashSet<>();
         final Set<String> commentIds = new HashSet<>();
         final Map<String, Set<String>> commenterToCommentId = new HashMap<>();
-
-        private Control(String category) {
-            // category not used any further
-        }
     }
 }

server/src/main/java/org/elasticsearch/common/lucene/search/XMoreLikeThis.java

@@ -1036,7 +1036,7 @@ private static class ScoreTerm {
             this.score = score;
         }
 
-        public void update(String word, String topField, float score) {
+        void update(String word, String topField, float score) {
             this.word = word;
             this.topField = topField;
             this.score = score;

server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java

@@ -309,10 +309,8 @@ public void parse(ParseContext context) throws IOException {
                         token = context.parser().nextToken();
                         double lat = context.parser().doubleValue();
                         token = context.parser().nextToken();
-                        @SuppressWarnings("unused")
-                        Double alt = Double.NaN;
                         if (token == XContentParser.Token.VALUE_NUMBER) {
-                            alt = GeoPoint.assertZValue(ignoreZValue.value(), context.parser().doubleValue());
+                            GeoPoint.assertZValue(ignoreZValue.value(), context.parser().doubleValue());
                         } else if (token != XContentParser.Token.END_ARRAY) {
                             throw new ElasticsearchParseException("[{}] field type does not accept > 3 dimensions", CONTENT_TYPE);
                         }

server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java

@@ -144,6 +144,13 @@ public CompositeAggregationBuilder size(int size) {
         return this;
     }
 
+    /**
+     * @return the number of composite buckets. Defaults to {@code 10}.
+     */
+    public int size() {
+        return size;
+    }
+
     @Override
     protected AggregatorFactory<?> doBuild(SearchContext context, AggregatorFactory<?> parent,
                                            AggregatorFactories.Builder subfactoriesBuilder) throws IOException {

server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java

@@ -27,14 +27,12 @@
 import org.elasticsearch.client.AdminClient;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.IndicesAdminClient;
-import org.elasticsearch.cluster.ClusterChangedEvent;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -55,7 +53,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -297,51 +294,6 @@ public void testClusterStateUpdate() throws InterruptedException {
             return null;
         }).when(mockIndicesAdminClient).deleteTemplate(any(DeleteIndexTemplateRequest.class), any(ActionListener.class));
 
-        new TemplateUpgradeService(Settings.EMPTY, mockClient, clusterService, threadPool,
-            Arrays.asList(
-                templates -> {
-                    assertNull(templates.put("added_test_template", IndexTemplateMetaData.builder("added_test_template")
-                        .patterns(Collections.singletonList("*")).build()));
-                    return templates;
-                },
-                templates -> {
-                    assertNotNull(templates.remove("removed_test_template"));
-                    return templates;
-                },
-                templates -> {
-                    assertNotNull(templates.put("changed_test_template", IndexTemplateMetaData.builder("changed_test_template")
-                        .patterns(Collections.singletonList("*")).order(10).build()));
-                    return templates;
-                }
-                )) {
-
-            @Override
-            void tryFinishUpgrade(AtomicBoolean anyUpgradeFailed) {
-                super.tryFinishUpgrade(anyUpgradeFailed);
-                finishInvocation.release();
-            }
-
-            @Override
-            void upgradeTemplates(Map<String, BytesReference> changes, Set<String> deletions) {
-                super.upgradeTemplates(changes, deletions);
-                updateInvocation.release();
-            }
-
-            @Override
-            Optional<Tuple<Map<String, BytesReference>, Set<String>>>
-                    calculateTemplateChanges(ImmutableOpenMap<String, IndexTemplateMetaData> templates) {
-                final Optional<Tuple<Map<String, BytesReference>, Set<String>>> ans = super.calculateTemplateChanges(templates);
-                calculateInvocation.release();
-                return ans;
-            }
-
-            @Override
-            public void clusterChanged(ClusterChangedEvent event) {
-                super.clusterChanged(event);
-                changedInvocation.release();
-            }
-        };
-
         ClusterState prevState = ClusterState.EMPTY_STATE;
         ClusterState state = ClusterState.builder(prevState).nodes(DiscoveryNodes.builder()
             .add(new DiscoveryNode("node1", "node1", buildNewFakeTransportAddress(), emptyMap(), MASTER_DATA_ROLES, Version.CURRENT)

server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java

@@ -298,10 +298,10 @@ public void testParsingAndToQuery12() throws IOException {
         assertGeoDistanceRangeQuery(query, 40, -70, 12, DistanceUnit.DEFAULT);
     }
 
-    private void assertGeoDistanceRangeQuery(String query, double lat, double lon, double distance, DistanceUnit distanceUnit) throws IOException {
-        // just parse the query
+    private void assertGeoDistanceRangeQuery(String query, double lat, double lon, double distance, DistanceUnit distanceUnit)
+            throws IOException {
         parseQuery(query).toQuery(createShardContext());
-     // TODO: what can we check?
+        // TODO: what can we check? See https://github.com/elastic/elasticsearch/issues/34043
     }
 
     public void testFromJson() throws IOException {

server/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java

@@ -57,7 +57,6 @@
 import org.elasticsearch.test.ESIntegTestCase.Scope;
 import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.junit.annotations.TestLogging;
-import org.elasticsearch.test.store.MockFSDirectoryService;
 import org.elasticsearch.test.store.MockFSIndexStore;
 import org.elasticsearch.test.transport.MockTransportService;
 import org.elasticsearch.test.transport.StubbableTransport;
@@ -550,7 +549,6 @@ public void testDisconnectsWhileRecovering() throws Exception {
         final Settings nodeSettings = Settings.builder()
                 .put(RecoverySettings.INDICES_RECOVERY_RETRY_DELAY_NETWORK_SETTING.getKey(), "100ms")
                 .put(RecoverySettings.INDICES_RECOVERY_INTERNAL_ACTION_TIMEOUT_SETTING.getKey(), "1s")
-                .put(MockFSDirectoryService.RANDOM_PREVENT_DOUBLE_WRITE_SETTING.getKey(), false) // restarted recoveries will delete temp files and write them again
                 .build();
         // start a master node
         internalCluster().startNode(nodeSettings);

server/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java

@@ -979,9 +979,7 @@ public void testTwoMovAvgsWithPredictions() {
     }
 
     public void testBadModelParams() {
-        try {
-            @SuppressWarnings("unused")
-            SearchResponse response = client()
+        expectThrows(SearchPhaseExecutionException.class, () -> client()
                     .prepareSearch("idx").setTypes("type")
                     .addAggregation(
                             histogram("histo").field(INTERVAL_FIELD).interval(interval)
@@ -991,11 +989,7 @@ public void testBadModelParams() {
                                             .window(10)
                                             .modelBuilder(randomModelBuilder(100))
                                             .gapPolicy(gapPolicy))
-                    ).execute().actionGet();
-        } catch (SearchPhaseExecutionException e) {
-            // All good
-        }
-
+                    ).execute().actionGet());
     }
 
     public void testHoltWintersMinimization() {

server/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java

@@ -974,7 +974,6 @@ public void testSuggestWithManyCandidates() throws InterruptedException, Executi
         suggest.size(1);
         searchSuggest = searchSuggest("united states house of representatives elections in washington 2006", "title", suggest);
         assertSuggestion(searchSuggest, 0, 0, "title", "united states house of representatives elections in washington 2006");
-        // assertThat(total, lessThan(1000L)); // Takes many seconds without fix - just for debugging
     }
 
     public void testSuggestWithFieldAlias() throws Exception {

server/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java

@@ -55,6 +55,7 @@ public void testThreadNames() throws Exception {
             }
         }
         logger.info("pre node threads are {}", preNodeStartThreadNames);
+        internalCluster().startNode();
         logger.info("do some indexing, flushing, optimize, and searches");
         int numDocs = randomIntBetween(2, 100);
         IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs];

test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryService.java

@@ -63,10 +63,6 @@ public class MockFSDirectoryService extends FsDirectoryService {
         Setting.doubleSetting("index.store.mock.random.io_exception_rate_on_open", 0.0d,  0.0d, Property.IndexScope, Property.NodeScope);
     public static final Setting<Double> RANDOM_IO_EXCEPTION_RATE_SETTING =
         Setting.doubleSetting("index.store.mock.random.io_exception_rate", 0.0d,  0.0d, Property.IndexScope, Property.NodeScope);
-    public static final Setting<Boolean> RANDOM_PREVENT_DOUBLE_WRITE_SETTING =
-        Setting.boolSetting("index.store.mock.random.prevent_double_write", true, Property.IndexScope, Property.NodeScope);
-    public static final Setting<Boolean> RANDOM_NO_DELETE_OPEN_FILE_SETTING =
-        Setting.boolSetting("index.store.mock.random.no_delete_open_file", true, Property.IndexScope, Property.NodeScope);
     public static final Setting<Boolean> CRASH_INDEX_SETTING =
         Setting.boolSetting("index.store.mock.random.crash_index", true, Property.IndexScope, Property.NodeScope);
 

test/framework/src/main/java/org/elasticsearch/test/store/MockFSIndexStore.java

@@ -61,8 +61,6 @@ public List<Setting<?>> getSettings() {
             return Arrays.asList(INDEX_CHECK_INDEX_ON_CLOSE_SETTING,
             MockFSDirectoryService.CRASH_INDEX_SETTING,
             MockFSDirectoryService.RANDOM_IO_EXCEPTION_RATE_SETTING,
-            MockFSDirectoryService.RANDOM_PREVENT_DOUBLE_WRITE_SETTING,
-            MockFSDirectoryService.RANDOM_NO_DELETE_OPEN_FILE_SETTING,
             MockFSDirectoryService.RANDOM_IO_EXCEPTION_RATE_ON_OPEN_SETTING);
         }
 
@@ -86,6 +84,7 @@ public void onIndexModule(IndexModule indexModule) {
         super(indexSettings);
     }
 
+    @Override
     public DirectoryService newDirectoryService(ShardPath path) {
         return new MockFSDirectoryService(indexSettings, this, path);
     }

x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/execution/search/SourceGeneratorTests.java

@@ -61,13 +61,12 @@ public void testQueryFilter() {
 
     public void testLimit() {
         QueryContainer container = new QueryContainer().withLimit(10).addGroups(singletonList(new GroupByColumnKey("1", "field")));
-        SearchSourceBuilder sourceBuilder = SourceGenerator.sourceBuilder(container, null, randomIntBetween(1, 10));
+        int size = randomIntBetween(1, 10);
+        SearchSourceBuilder sourceBuilder = SourceGenerator.sourceBuilder(container, null, size);
         Builder aggBuilder = sourceBuilder.aggregations();
         assertEquals(1, aggBuilder.count());
-        @SuppressWarnings("unused")
         CompositeAggregationBuilder composite = (CompositeAggregationBuilder) aggBuilder.getAggregatorFactories().get(0);
-        // TODO: cannot access size
-        //assertEquals(10, composite.size());
+        assertEquals(size, composite.size());
     }
 
     public void testSortNoneSpecified() {

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/pagerduty/PagerDutyAccount.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.watcher.notification.pagerduty;
 
-import org.apache.logging.log4j.Logger;
 import org.elasticsearch.common.settings.SecureSetting;
 import org.elasticsearch.common.settings.SecureString;
 import org.elasticsearch.common.settings.Setting;
@@ -30,7 +29,7 @@ public class PagerDutyAccount {
     private final HttpClient httpClient;
     private final IncidentEventDefaults eventDefaults;
 
-    PagerDutyAccount(String name, Settings accountSettings, Settings serviceSettings, HttpClient httpClient, Logger logger) {
+    PagerDutyAccount(String name, Settings accountSettings, Settings serviceSettings, HttpClient httpClient) {
         this.name = name;
         this.serviceKey = getServiceKey(name, accountSettings, serviceSettings);
         this.httpClient = httpClient;

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/pagerduty/PagerDutyService.java

@@ -51,7 +51,7 @@ public PagerDutyService(Settings settings, HttpClient httpClient, ClusterSetting
 
     @Override
     protected PagerDutyAccount createAccount(String name, Settings accountSettings) {
-        return new PagerDutyAccount(name, accountSettings, accountSettings, httpClient, logger);
+        return new PagerDutyAccount(name, accountSettings, accountSettings, httpClient);
     }
 
     public static List<Setting<?>> getSettings() {

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.watcher.test;
 
-import org.apache.logging.log4j.Logger;
 import org.elasticsearch.action.admin.indices.alias.Alias;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
 import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse;
@@ -181,7 +180,7 @@ protected boolean timeWarped() {
     public void _setup() throws Exception {
         if (timeWarped()) {
             timeWarp = new TimeWarp(internalCluster().getInstances(ScheduleTriggerEngineMock.class),
-                    (ClockMock)getInstanceFromMaster(Clock.class), logger);
+                    (ClockMock)getInstanceFromMaster(Clock.class));
         }
 
         if (internalCluster().size() > 0) {
@@ -542,7 +541,7 @@ protected static class TimeWarp {
         private final List<ScheduleTriggerEngineMock> schedulers;
         private final ClockMock clock;
 
-        TimeWarp(Iterable<ScheduleTriggerEngineMock> schedulers, ClockMock clock, Logger logger) {
+        TimeWarp(Iterable<ScheduleTriggerEngineMock> schedulers, ClockMock clock) {
             this.schedulers = StreamSupport.stream(schedulers.spliterator(), false).collect(Collectors.toList());
             this.clock = clock;
         }