diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/MultiTermVectorsRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/MultiTermVectorsRequest.java
index 8ec5e79993c..4008e50aa4f 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/MultiTermVectorsRequest.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/MultiTermVectorsRequest.java
@@ -37,7 +37,7 @@ public class MultiTermVectorsRequest implements ToXContentObject, Validatable {
      * Constructs an empty MultiTermVectorsRequest
      * After that use {@code add} method to add individual {@code TermVectorsRequest} to it.
      */
-    public MultiTermVectorsRequest() {};
+    public MultiTermVectorsRequest() {}
 
     /**
      * Constructs a MultiTermVectorsRequest from the given document ids
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/job/config/DetectionRule.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/job/config/DetectionRule.java
index bcba8a7d74a..7adeca1543f 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/job/config/DetectionRule.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/job/config/DetectionRule.java
@@ -38,7 +38,7 @@ public class DetectionRule implements ToXContentObject {
     public static final ParseField CONDITIONS_FIELD = new ParseField("conditions");
 
     public static final ObjectParser<Builder, Void> PARSER =
-        new ObjectParser<>(DETECTION_RULE_FIELD.getPreferredName(), true, Builder::new);;
+        new ObjectParser<>(DETECTION_RULE_FIELD.getPreferredName(), true, Builder::new);
 
     static {
         PARSER.declareStringArray(Builder::setActions, ACTIONS_FIELD);
diff --git a/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java b/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java
index 889f1619614..e089b8a956a 100644
--- a/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java
+++ b/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java
@@ -297,7 +297,7 @@ public class ObjectParserTests extends ESTestCase {
 
     enum TestEnum {
         FOO, BAR
-    };
+    }
 
     public void testParseEnumFromString() throws IOException {
         class TestStruct {
diff --git a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepTypesFilterFactory.java b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepTypesFilterFactory.java
index b6b8b45fabf..f0b069c76a7 100644
--- a/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepTypesFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/KeepTypesFilterFactory.java
@@ -69,7 +69,7 @@ public class KeepTypesFilterFactory extends AbstractTokenFilterFactory {
                         + KeepTypesMode.EXCLUDE + "] but was [" + modeString + "].");
             }
         }
-    };
+    }
 
     KeepTypesFilterFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) {
         super(indexSettings, name, settings);
diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/MetricDetail.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/MetricDetail.java
index bc95b03c8bd..da77825c0c8 100644
--- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/MetricDetail.java
+++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/MetricDetail.java
@@ -37,7 +37,7 @@ public interface MetricDetail extends ToXContentObject, NamedWriteable {
         innerToXContent(builder, params);
         builder.endObject();
         return builder.endObject();
-    };
+    }
 
     default String getMetricName() {
         return getWriteableName();
diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java
index d452ea23bc1..c9eba1927ef 100644
--- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java
+++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java
@@ -60,7 +60,7 @@ public abstract class AbstractAsyncBulkByScrollActionScriptTestCase<
             public void execute() {
                 scriptBody.accept(getCtx());
             }
-        };;
+        };
         when(scriptService.compile(any(), eq(UpdateScript.CONTEXT))).thenReturn(factory);
         AbstractAsyncBulkByScrollAction<Request> action = action(scriptService, request().setScript(mockScript("")));
         RequestWrapper<?> result = action.buildScriptApplier().apply(AbstractAsyncBulkByScrollAction.wrap(index), doc);
diff --git a/server/src/main/java/org/elasticsearch/common/settings/Settings.java b/server/src/main/java/org/elasticsearch/common/settings/Settings.java
index 107c7bb9b8a..72f9406edac 100644
--- a/server/src/main/java/org/elasticsearch/common/settings/Settings.java
+++ b/server/src/main/java/org/elasticsearch/common/settings/Settings.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.common.settings;
 
 import org.apache.logging.log4j.Level;
-import org.elasticsearch.core.internal.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.ElasticsearchParseException;
@@ -44,6 +43,7 @@ import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParserUtils;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.core.internal.io.IOUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -60,12 +60,12 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.ListIterator;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.function.Predicate;
diff --git a/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java
index ce1bfe87131..a93664b517f 100644
--- a/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java
+++ b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.common.util;
 
 import com.carrotsearch.hppc.ObjectArrayList;
+
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefArray;
 import org.apache.lucene.util.BytesRefBuilder;
@@ -301,8 +302,8 @@ public class CollectionUtils {
         public int size() {
             return in.size();
         }
+    }
 
-    };
     public static void sort(final BytesRefArray bytes, final int[] indices) {
         sort(new BytesRefBuilder(), new BytesRefBuilder(), bytes, indices);
     }
diff --git a/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java
index 38ae484a42b..7539c1653cc 100644
--- a/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java
+++ b/server/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCacheFactory.java
@@ -36,7 +36,7 @@ public class PreBuiltCacheFactory {
      * ELASTICSEARCH     Exactly one version per elasticsearch version is stored. Useful if you change an analyzer between elasticsearch
      *                   releases, when the lucene version does not change
      */
-    public enum CachingStrategy { ONE, LUCENE, ELASTICSEARCH };
+    public enum CachingStrategy { ONE, LUCENE, ELASTICSEARCH }
 
     public interface PreBuiltCache<T> {
 
diff --git a/server/src/main/java/org/elasticsearch/script/ScoreScriptUtils.java b/server/src/main/java/org/elasticsearch/script/ScoreScriptUtils.java
index f1358bc3c6b..273b8fcf855 100644
--- a/server/src/main/java/org/elasticsearch/script/ScoreScriptUtils.java
+++ b/server/src/main/java/org/elasticsearch/script/ScoreScriptUtils.java
@@ -132,7 +132,7 @@ public final class ScoreScriptUtils {
             this.originLat = origin.lat();
             this.originLon = origin.lon();
             this.offset = DistanceUnit.DEFAULT.parse(offsetStr, DistanceUnit.DEFAULT);
-            this.scaling =  0.5 * Math.pow(scale, 2.0) / Math.log(decay);;
+            this.scaling =  0.5 * Math.pow(scale, 2.0) / Math.log(decay);
         }
 
         public double decayGeoGauss(GeoPoint docValue) {
diff --git a/server/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java b/server/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java
index 2cfcdf1ae66..0633f1c6bbe 100644
--- a/server/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java
+++ b/server/src/main/java/org/elasticsearch/search/query/EarlyTerminatingCollector.java
@@ -78,7 +78,7 @@ public class EarlyTerminatingCollector extends FilterCollector {
                     }
                 }
                 super.collect(doc);
-            };
+            }
         };
     }
 
diff --git a/server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
index 6d58917d84b..9bd1efbe757 100644
--- a/server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
+++ b/server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
@@ -93,7 +93,7 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> {
         this.setNestedPath(template.getNestedPath());
         if (template.getNestedSort() != null) {
             this.setNestedSort(template.getNestedSort());
-        };
+        }
     }
 
     /**
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestTests.java
index fbe8761a07d..59518b6e996 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestTests.java
@@ -76,7 +76,7 @@ public class RestoreSnapshotRequestTests extends AbstractWireSerializingTestCase
             int count = randomInt(3) + 1;
 
             for (int i = 0; i < count; ++i) {
-                indexSettings.put(randomAlphaOfLengthBetween(2, 5), randomAlphaOfLengthBetween(2, 5));;
+                indexSettings.put(randomAlphaOfLengthBetween(2, 5), randomAlphaOfLengthBetween(2, 5));
             }
             instance.indexSettings(indexSettings);
         }
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java
index 66eabd4cbd9..7012b7af68c 100644
--- a/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java
@@ -83,5 +83,5 @@ public class GroupShardsIteratorTests extends ESTestCase {
             shardRouting = ShardRoutingHelper.moveToStarted(shardRouting);
         }
         return shardRouting;
-    };
+    }
 }
diff --git a/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java b/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java
index ebb15b42b7a..ee31b9d85f7 100644
--- a/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java
@@ -34,8 +34,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
@@ -260,8 +262,10 @@ public class TaskBatcherTests extends TaskExecutorTests {
         Map<Integer, TestListener> tasks = new HashMap<>();
         final int numOfTasks = randomInt(10);
         final CountDownLatch latch = new CountDownLatch(numOfTasks);
+        Set<Integer> usedKeys = new HashSet<>(numOfTasks);
         for (int i = 0; i < numOfTasks; i++) {
-            while (null != tasks.put(randomInt(1024), new TestListener() {
+            int key = randomValueOtherThanMany(k -> usedKeys.contains(k), () -> randomInt(1024));
+            tasks.put(key, new TestListener() {
                 @Override
                 public void processed(String source) {
                     latch.countDown();
@@ -271,8 +275,10 @@ public class TaskBatcherTests extends TaskExecutorTests {
                 public void onFailure(String source, Exception e) {
                     fail(ExceptionsHelper.detailedMessage(e));
                 }
-            })) ;
+            });
+            usedKeys.add(key);
         }
+        assert usedKeys.size() == numOfTasks;
 
         TestExecutor<Integer> executor = taskList -> {
             assertThat(taskList.size(), equalTo(tasks.size()));
diff --git a/server/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java
index c2e62277da7..9b3a2d9ce44 100644
--- a/server/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java
+++ b/server/src/test/java/org/elasticsearch/common/geo/GeoDistanceTests.java
@@ -45,7 +45,7 @@ public class GeoDistanceTests extends ESTestCase {
         GeoDistance geoDistance = randomFrom(GeoDistance.PLANE, GeoDistance.ARC);
         try (BytesStreamOutput out = new BytesStreamOutput()) {
             geoDistance.writeTo(out);
-            try (StreamInput in = out.bytes().streamInput()) {;
+            try (StreamInput in = out.bytes().streamInput()) {
                 GeoDistance copy = GeoDistance.readFromStream(in);
                 assertEquals(copy.toString() + " vs. " + geoDistance.toString(), copy, geoDistance);
             }
diff --git a/server/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java
index b3892d9d551..10ac6e1b014 100644
--- a/server/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java
+++ b/server/src/test/java/org/elasticsearch/common/geo/builders/CircleBuilderTests.java
@@ -19,9 +19,8 @@
 
 package org.elasticsearch.common.geo.builders;
 
-import org.locationtech.jts.geom.Coordinate;
-
 import org.elasticsearch.common.unit.DistanceUnit;
+import org.locationtech.jts.geom.Coordinate;
 
 import java.io.IOException;
 
@@ -59,7 +58,7 @@ public class CircleBuilderTests extends AbstractShapeBuilderTestCase<CircleBuild
             DistanceUnit newRandom = unit;
             while (newRandom == unit) {
                 newRandom = randomFrom(DistanceUnit.values());
-            };
+            }
             unit = newRandom;
         }
         return mutation.radius(radius, unit);
diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java
index adfe90755dd..430cd900660 100644
--- a/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java
+++ b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java
@@ -570,7 +570,7 @@ public class BytesStreamsTests extends ESTestCase {
     }
 
     public void testReadWriteGeoPoint() throws IOException {
-        try (BytesStreamOutput out = new BytesStreamOutput()) {;
+        try (BytesStreamOutput out = new BytesStreamOutput()) {
             GeoPoint geoPoint = new GeoPoint(randomDouble(), randomDouble());
             out.writeGenericValue(geoPoint);
             StreamInput wrap = out.bytes().streamInput();
diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java
index 387f15e3f33..72a1e21d788 100644
--- a/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java
+++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java
@@ -67,7 +67,7 @@ public class AsyncIOProcessorTests extends ESTestCase {
                     } catch (Exception ex) {
                         throw new RuntimeException(ex);
                     }
-                };
+                }
             };
             thread[i].start();
         }
@@ -120,7 +120,7 @@ public class AsyncIOProcessorTests extends ESTestCase {
                     } catch (Exception ex) {
                         throw new RuntimeException(ex);
                     }
-                };
+                }
             };
             thread[i].start();
         }
diff --git a/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java b/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java
index 115785b2e7b..e45ddd87ba3 100644
--- a/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java
+++ b/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java
@@ -392,7 +392,7 @@ public class LiveVersionMapTests extends ESTestCase {
     public void testPruneTombstonesWhileLocked() throws InterruptedException, IOException {
         LiveVersionMap map = new LiveVersionMap();
         BytesRef uid = uid("1");
-        ;
+
         try (Releasable ignore = map.acquireLock(uid)) {
             map.putDeleteUnderLock(uid, new DeleteVersionValue(0, 0, 0, 0));
             map.beforeRefresh(); // refresh otherwise we won't prune since it's tracked by the current map
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
index d7f8d48fc5c..dd7cb17ef12 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java
@@ -51,8 +51,8 @@ import java.util.List;
 import java.util.Map;
 
 import static java.util.Collections.singletonList;
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
 import static java.util.Collections.singletonMap;
+import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
@@ -81,7 +81,7 @@ public class KeywordFieldMapperTests extends ESSingleNodeTestCase {
             });
         }
 
-    };
+    }
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java
index fa0a372a2ad..c99886c3f66 100644
--- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java
+++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java
@@ -861,6 +861,6 @@ public class FunctionScoreTests extends ESTestCase {
         @Override
         protected int doHashCode() {
             return 0;
-        };
+        }
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java
index 8c84c8f3f56..76c6dc03b5a 100644
--- a/server/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryRequestTests.java
@@ -56,10 +56,10 @@ public class DeleteByQueryRequestTests extends AbstractBulkByScrollRequestTestCa
             newIndices[i] = randomSimpleString(random(), 1, 30);
         }
         request.indices(newIndices);
-        for (int i = 0; i < numNewIndices; i++) {;
+        for (int i = 0; i < numNewIndices; i++) {
             assertEquals(newIndices[i], request.indices()[i]);
         }
-        for (int i = 0; i < numNewIndices; i++) {;
+        for (int i = 0; i < numNewIndices; i++) {
             assertEquals(newIndices[i], request.getSearchRequest().indices()[i]);
         }
     }
diff --git a/server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java
index 47449eb7391..207f0f12ff2 100644
--- a/server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryRequestTests.java
@@ -49,10 +49,10 @@ public class UpdateByQueryRequestTests extends AbstractBulkByScrollRequestTestCa
             newIndices[i] = randomSimpleString(random(), 1, 30);
         }
         request.indices(newIndices);
-        for (int i = 0; i < numNewIndices; i++) {;
+        for (int i = 0; i < numNewIndices; i++) {
             assertEquals(newIndices[i], request.indices()[i]);
         }
-        for (int i = 0; i < numNewIndices; i++) {;
+        for (int i = 0; i < numNewIndices; i++) {
             assertEquals(newIndices[i], request.getSearchRequest().indices()[i]);
         }
     }
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalPercentilesBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalPercentilesBucketTests.java
index 78ef2e1df39..6ce0c07f96f 100644
--- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalPercentilesBucketTests.java
+++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalPercentilesBucketTests.java
@@ -28,9 +28,6 @@ import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.search.aggregations.Aggregation.CommonFields;
 import org.elasticsearch.search.aggregations.ParsedAggregation;
 import org.elasticsearch.search.aggregations.metrics.Percentile;
-import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
-import org.elasticsearch.search.aggregations.pipeline.InternalPercentilesBucket;
-import org.elasticsearch.search.aggregations.pipeline.ParsedPercentilesBucket;
 import org.elasticsearch.test.InternalAggregationTestCase;
 
 import java.io.IOException;
@@ -192,7 +189,6 @@ public class InternalPercentilesBucketTests extends InternalAggregationTestCase<
         String name = instance.getName();
         double[] percents = extractPercents(instance);
         double[] percentiles = extractPercentiles(instance);
-        ;
         DocValueFormat formatter = instance.formatter();
         List<PipelineAggregator> pipelineAggregators = instance.pipelineAggregators();
         Map<String, Object> metaData = instance.getMetaData();
diff --git a/server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java
index b0613b320b8..e644a070fae 100644
--- a/server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java
+++ b/server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java
@@ -152,7 +152,7 @@ public class NestedSortBuilderTests extends ESTestCase {
             @Override
             protected QueryBuilder doRewrite(org.elasticsearch.index.query.QueryRewriteContext queryShardContext) throws IOException {
                 return new MatchAllQueryBuilder();
-            };
+            }
         };
         // test that filter gets rewritten
         NestedSortBuilder original = new NestedSortBuilder("path").setFilter(filterThatRewrites);
diff --git a/test/framework/src/main/java/org/elasticsearch/test/EqualsHashCodeTestUtils.java b/test/framework/src/main/java/org/elasticsearch/test/EqualsHashCodeTestUtils.java
index 44b845e5c2c..d08b9541ffb 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/EqualsHashCodeTestUtils.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/EqualsHashCodeTestUtils.java
@@ -40,7 +40,7 @@ public class EqualsHashCodeTestUtils {
      */
     public interface CopyFunction<T> {
         T copy(T t) throws IOException;
-    };
+    }
 
     /**
      * A function that creates a copy of its input argument that is different from its
@@ -48,7 +48,7 @@ public class EqualsHashCodeTestUtils {
      */
     public interface MutateFunction<T> {
         T mutate(T t) throws IOException;
-    };
+    }
 
     /**
      * Perform common equality and hashCode checks on the input object
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/FrozenEngine.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/FrozenEngine.java
index 513400cb72c..7fbb58504ef 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/FrozenEngine.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/FrozenEngine.java
@@ -324,7 +324,7 @@ public final class FrozenEngine extends ReadOnlyEngine {
                 @Override
                 public LeafReader wrap(LeafReader reader) {
                     return new LazyLeafReader(reader);
-                };
+                }
             });
             this.delegate = reader;
             this.engine = engine;
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/DataCounts.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/DataCounts.java
index b13e702e85d..08a6d8846f9 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/DataCounts.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/DataCounts.java
@@ -45,14 +45,14 @@ public class DataCounts implements ToXContentObject, Writeable {
     public static final String MISSING_FIELD_COUNT_STR = "missing_field_count";
     public static final String OUT_OF_ORDER_TIME_COUNT_STR = "out_of_order_timestamp_count";
     public static final String EMPTY_BUCKET_COUNT_STR = "empty_bucket_count";
-    public static final String SPARSE_BUCKET_COUNT_STR = "sparse_bucket_count";    
+    public static final String SPARSE_BUCKET_COUNT_STR = "sparse_bucket_count";
     public static final String BUCKET_COUNT_STR = "bucket_count";
     public static final String EARLIEST_RECORD_TIME_STR = "earliest_record_timestamp";
     public static final String LATEST_RECORD_TIME_STR = "latest_record_timestamp";
     public static final String LAST_DATA_TIME_STR = "last_data_time";
     public static final String LATEST_EMPTY_BUCKET_TIME_STR = "latest_empty_bucket_timestamp";
     public static final String LATEST_SPARSE_BUCKET_TIME_STR = "latest_sparse_bucket_timestamp";
-    
+
     public static final ParseField PROCESSED_RECORD_COUNT = new ParseField(PROCESSED_RECORD_COUNT_STR);
     public static final ParseField PROCESSED_FIELD_COUNT = new ParseField(PROCESSED_FIELD_COUNT_STR);
     public static final ParseField INPUT_BYTES = new ParseField(INPUT_BYTES_STR);
@@ -68,7 +68,7 @@ public class DataCounts implements ToXContentObject, Writeable {
     public static final ParseField LATEST_RECORD_TIME = new ParseField(LATEST_RECORD_TIME_STR);
     public static final ParseField LAST_DATA_TIME = new ParseField(LAST_DATA_TIME_STR);
     public static final ParseField LATEST_EMPTY_BUCKET_TIME = new ParseField(LATEST_EMPTY_BUCKET_TIME_STR);
-    public static final ParseField LATEST_SPARSE_BUCKET_TIME = new ParseField(LATEST_SPARSE_BUCKET_TIME_STR);   
+    public static final ParseField LATEST_SPARSE_BUCKET_TIME = new ParseField(LATEST_SPARSE_BUCKET_TIME_STR);
 
     public static final ParseField TYPE = new ParseField("data_counts");
 
@@ -99,7 +99,7 @@ public class DataCounts implements ToXContentObject, Writeable {
                 p -> TimeUtils.parseTimeField(p, LATEST_EMPTY_BUCKET_TIME.getPreferredName()), LATEST_EMPTY_BUCKET_TIME, ValueType.VALUE);
         PARSER.declareField(ConstructingObjectParser.optionalConstructorArg(),
                 p -> TimeUtils.parseTimeField(p, LATEST_SPARSE_BUCKET_TIME.getPreferredName()), LATEST_SPARSE_BUCKET_TIME, ValueType.VALUE);
-        PARSER.declareLong((t, u) -> {;}, INPUT_RECORD_COUNT);
+        PARSER.declareLong((t, u) -> {/* intentionally empty */}, INPUT_RECORD_COUNT);
     }
 
     public static String documentId(String jobId) {
@@ -131,7 +131,7 @@ public class DataCounts implements ToXContentObject, Writeable {
     public DataCounts(String jobId, long processedRecordCount, long processedFieldCount, long inputBytes,
                       long inputFieldCount, long invalidDateCount, long missingFieldCount, long outOfOrderTimeStampCount,
                       long emptyBucketCount, long sparseBucketCount, long bucketCount,
-                      Date earliestRecordTimeStamp, Date latestRecordTimeStamp, Date lastDataTimeStamp, 
+                      Date earliestRecordTimeStamp, Date latestRecordTimeStamp, Date lastDataTimeStamp,
                       Date latestEmptyBucketTimeStamp, Date latestSparseBucketTimeStamp) {
         this.jobId = jobId;
         this.processedRecordCount = processedRecordCount;
@@ -195,7 +195,7 @@ public class DataCounts implements ToXContentObject, Writeable {
         if (in.readBoolean()) {
             lastDataTimeStamp = new Date(in.readVLong());
         }
-        if (in.readBoolean()) {            
+        if (in.readBoolean()) {
             latestEmptyBucketTimeStamp = new Date(in.readVLong());
         }
         if (in.readBoolean()) {
@@ -346,9 +346,9 @@ public class DataCounts implements ToXContentObject, Writeable {
     public void incrementEmptyBucketCount(long additional) {
         emptyBucketCount += additional;
     }
-    
+
     /**
-     * The number of buckets with few records compared to the overall counts. 
+     * The number of buckets with few records compared to the overall counts.
      * Used to measure general data fitness and/or configuration problems (bucket span).
      *
      * @return Number of sparse buckets processed by this job {@code long}
@@ -360,7 +360,7 @@ public class DataCounts implements ToXContentObject, Writeable {
     public void incrementSparseBucketCount(long additional) {
         sparseBucketCount += additional;
     }
-    
+
     /**
      * The number of buckets overall.
      *
@@ -443,7 +443,7 @@ public class DataCounts implements ToXContentObject, Writeable {
     public void setLatestEmptyBucketTimeStamp(Date latestEmptyBucketTimeStamp) {
         this.latestEmptyBucketTimeStamp = latestEmptyBucketTimeStamp;
     }
-    
+
     public void updateLatestEmptyBucketTimeStamp(Date latestEmptyBucketTimeStamp) {
         if (latestEmptyBucketTimeStamp != null &&
                 (this.latestEmptyBucketTimeStamp == null ||
@@ -472,7 +472,7 @@ public class DataCounts implements ToXContentObject, Writeable {
             this.latestSparseBucketTimeStamp = latestSparseBucketTimeStamp;
         }
     }
-    
+
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(jobId);
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/scheduler/Cron.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/scheduler/Cron.java
index d4ccc22d32a..607b49be1f4 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/scheduler/Cron.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/scheduler/Cron.java
@@ -1214,7 +1214,7 @@ public class Cron implements ToXContentFragment {
 
     private static int skipWhiteSpace(int i, String s) {
         for (; i < s.length() && (s.charAt(i) == ' ' || s.charAt(i) == '\t'); i++) {
-            ;
+            // intentionally empty
         }
 
         return i;
@@ -1222,7 +1222,7 @@ public class Cron implements ToXContentFragment {
 
     private static int findNextWhiteSpace(int i, String s) {
         for (; i < s.length() && (s.charAt(i) != ' ' || s.charAt(i) != '\t'); i++) {
-            ;
+            // intentionally empty
         }
 
         return i;
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisLimitsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisLimitsTests.java
index f73fcc41bce..05b7e2719fb 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisLimitsTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisLimitsTests.java
@@ -167,6 +167,7 @@ public class AnalysisLimitsTests extends AbstractSerializingTestCase<AnalysisLim
         new AnalysisLimits(1L, 1L);
     }
 
+    @Override
     protected AnalysisLimits mutateInstance(AnalysisLimits instance) throws IOException {
         Long memoryModelLimit = instance.getModelMemoryLimit();
         Long categorizationExamplesLimit = instance.getCategorizationExamplesLimit();
@@ -197,5 +198,5 @@ public class AnalysisLimitsTests extends AbstractSerializingTestCase<AnalysisLim
             throw new AssertionError("Illegal randomisation branch");
         }
         return new AnalysisLimits(memoryModelLimit, categorizationExamplesLimit);
-    };
+    }
 }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/DataDescriptionTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/DataDescriptionTests.java
index 99cf3df31b4..9d92b2999c5 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/DataDescriptionTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/DataDescriptionTests.java
@@ -282,6 +282,7 @@ public class DataDescriptionTests extends AbstractSerializingTestCase<DataDescri
         return DataDescription.STRICT_PARSER.apply(parser, null).build();
     }
 
+    @Override
     protected DataDescription mutateInstance(DataDescription instance) throws java.io.IOException {
         DataFormat format = instance.getFormat();
         String timeField = instance.getTimeField();
@@ -320,5 +321,5 @@ public class DataDescriptionTests extends AbstractSerializingTestCase<DataDescri
             throw new AssertionError("Illegal randomisation branch");
         }
         return new DataDescription(format, timeField, timeFormat, delimiter, quoteChar);
-    };
+    }
 }
diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsRestIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsRestIT.java
index b794fee3118..e721b5b88fd 100644
--- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsRestIT.java
+++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/test/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsRestIT.java
@@ -239,7 +239,7 @@ public class DatafeedJobsRestIT extends ESRestTestCase {
                 + "      \"network_bytes_out\": { \"type\":\"long\"}"
                 + "    }"
                 + "  }"
-                + "}");;
+                + "}");
         client().performRequest(createIndexRequest);
 
         StringBuilder bulk = new StringBuilder();
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportForecastJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportForecastJobAction.java
index 3a26f9f863c..ac3d41f26e0 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportForecastJobAction.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportForecastJobAction.java
@@ -78,7 +78,7 @@ public class TransportForecastJobAction extends TransportJobTaskAction<ForecastJ
                     ForecastParams params = paramsBuilder.build();
                     processManager.forecastJob(task, params, e -> {
                         if (e == null) {
-;                           getForecastRequestStats(request.getJobId(), params.getForecastId(), listener);
+                            getForecastRequestStats(request.getJobId(), params.getForecastId(), listener);
                         } else {
                             listener.onFailure(e);
                         }
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/normalizer/Normalizable.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/normalizer/Normalizable.java
index 0d88372de17..8a2a57d1a46 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/normalizer/Normalizable.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/process/normalizer/Normalizable.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Objects;
 
 public abstract class Normalizable implements ToXContentObject {
-    public enum ChildType {BUCKET_INFLUENCER, RECORD};
+    public enum ChildType {BUCKET_INFLUENCER, RECORD}
 
     private final String indexName;
     private boolean hadBigNormalizedUpdate;
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java
index 097758976da..f0137a250cc 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java
@@ -745,7 +745,7 @@ public class Analyzer extends RuleExecutor<LogicalPlan> {
                 }
             }
             return ua;
-        };
+        }
     }
 
     // to avoid creating duplicate functions
@@ -920,7 +920,7 @@ public class Analyzer extends RuleExecutor<LogicalPlan> {
             }
             return p;
         }
-    };
+    }
 
     //
     // Handle aggs in HAVING. To help folding any aggs not found in Aggregation
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/AttributeMap.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/AttributeMap.java
index b5d13761772..9f64246a514 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/AttributeMap.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/AttributeMap.java
@@ -138,7 +138,7 @@ public class AttributeMap<E> {
         public String toString() {
             return set.toString();
         }
-    };
+    }
 
     private final Map<AttributeWrapper, E> delegate;
     private Set<Attribute> keySet = null;
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringProcessor.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringProcessor.java
index fb9f152504b..6f8d7c93fc6 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringProcessor.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/string/StringProcessor.java
@@ -17,7 +17,7 @@ import java.util.Locale;
 import java.util.function.Function;
 
 public class StringProcessor implements Processor {
-    
+
     private interface StringFunction<R> {
         default R apply(Object o) {
             if (!(o instanceof String || o instanceof Character)) {
@@ -57,11 +57,11 @@ public class StringProcessor implements Processor {
             int i = n.intValue();
             if (i < 0) {
                 return null;
-            };
+            }
             char[] spaces = new char[i];
             char whitespace = ' ';
             Arrays.fill(spaces, whitespace);
-            
+
             return new String(spaces);
         }),
         BIT_LENGTH((String s) -> UnicodeUtil.calcUTF16toUTF8Length(s, 0, s.length()) * 8),
@@ -91,7 +91,7 @@ public class StringProcessor implements Processor {
             return this == CHAR ? "character" : super.toString();
         }
     }
-    
+
     public static final String NAME = "s";
 
     private final StringOperation processor;
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/optimizer/Optimizer.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/optimizer/Optimizer.java
index 1865fd4eea1..38313fa613a 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/optimizer/Optimizer.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/optimizer/Optimizer.java
@@ -1136,7 +1136,7 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
             return e.foldable() ? Literal.of(e) : e;
         }
     }
-    
+
     static class SimplifyConditional extends OptimizerExpressionRule {
 
         SimplifyConditional() {
@@ -1355,7 +1355,7 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
      * Propagate Equals to eliminate conjuncted Ranges.
      * When encountering a different Equals or non-containing {@link Range}, the conjunction becomes false.
      * When encountering a containing {@link Range}, the range gets eliminated by the equality.
-     * 
+     *
      * This rule doesn't perform any promotion of {@link BinaryComparison}s, that is handled by
      * {@link CombineBinaryComparisons} on purpose as the resulting Range might be foldable
      * (which is picked by the folding rule on the next run).
@@ -1420,7 +1420,7 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                     continue;
                 }
                 Object eqValue = eq.right().fold();
-                
+
                 for (int i = 0; i < ranges.size(); i++) {
                     Range range = ranges.get(i);
 
@@ -1448,14 +1448,14 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                                 return FALSE;
                             }
                         }
-                        
+
                         // it's in the range and thus, remove it
                         ranges.remove(i);
                         changed = true;
                     }
                 }
             }
-            
+
             return changed ? Predicates.combineAnd(CollectionUtils.combine(exps, equals, ranges)) : and;
         }
     }
@@ -1475,7 +1475,7 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
             }
             return e;
         }
-        
+
         // combine conjunction
         private Expression combine(And and) {
             List<Range> ranges = new ArrayList<>();
@@ -1504,7 +1504,7 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                     exps.add(ex);
                 }
             }
-            
+
             // finally try combining any left BinaryComparisons into possible Ranges
             // this could be a different rule but it's clearer here wrt the order of comparisons
 
@@ -1513,14 +1513,14 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
 
                 for (int j = i + 1; j < bcs.size(); j++) {
                     BinaryComparison other = bcs.get(j);
-                    
+
                     if (main.left().semanticEquals(other.left())) {
                         // >/>= AND </<=
                         if ((main instanceof GreaterThan || main instanceof GreaterThanOrEqual)
                                 && (other instanceof LessThan || other instanceof LessThanOrEqual)) {
                             bcs.remove(j);
                             bcs.remove(i);
-                            
+
                             ranges.add(new Range(and.source(), main.left(),
                                     main.right(), main instanceof GreaterThanOrEqual,
                                     other.right(), other instanceof LessThanOrEqual));
@@ -1532,7 +1532,7 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                                 && (main instanceof LessThan || main instanceof LessThanOrEqual)) {
                             bcs.remove(j);
                             bcs.remove(i);
-                            
+
                             ranges.add(new Range(and.source(), main.left(),
                                     other.right(), other instanceof GreaterThanOrEqual,
                                     main.right(), main instanceof LessThanOrEqual));
@@ -1542,8 +1542,8 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                     }
                 }
             }
-            
-            
+
+
             return changed ? Predicates.combineAnd(CollectionUtils.combine(exps, bcs, ranges)) : and;
         }
 
@@ -1690,13 +1690,13 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
 
         private boolean findConjunctiveComparisonInRange(BinaryComparison main, List<Range> ranges) {
             Object value = main.right().fold();
-            
+
             // NB: the loop modifies the list (hence why the int is used)
             for (int i = 0; i < ranges.size(); i++) {
                 Range other = ranges.get(i);
-                
+
                 if (main.left().semanticEquals(other.value())) {
- 
+
                     if (main instanceof GreaterThan || main instanceof GreaterThanOrEqual) {
                         if (other.lower().foldable()) {
                             Integer comp = BinaryComparison.compare(value, other.lower().fold());
@@ -1705,7 +1705,7 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                                 boolean lowerEq = comp == 0 && other.includeLower() && main instanceof GreaterThan;
                                  // 2 < a AND (1 < a < 3) -> 2 < a < 3
                                 boolean lower = comp > 0 || lowerEq;
-                                
+
                                 if (lower) {
                                     ranges.remove(i);
                                     ranges.add(i,
@@ -1745,14 +1745,14 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
             }
             return false;
         }
-    
+
         /**
          * Find commonalities between the given comparison in the given list.
          * The method can be applied both for conjunctive (AND) or disjunctive purposes (OR).
          */
         private static boolean findExistingComparison(BinaryComparison main, List<BinaryComparison> bcs, boolean conjunctive) {
             Object value = main.right().fold();
-            
+
             // NB: the loop modifies the list (hence why the int is used)
             for (int i = 0; i < bcs.size(); i++) {
                 BinaryComparison other = bcs.get(i);
@@ -1763,10 +1763,10 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                 // if bc is a higher/lower value or gte vs gt, use it instead
                 if ((other instanceof GreaterThan || other instanceof GreaterThanOrEqual) &&
                     (main instanceof GreaterThan || main instanceof GreaterThanOrEqual)) {
-                    
+
                     if (main.left().semanticEquals(other.left())) {
                         Integer compare = BinaryComparison.compare(value, other.right().fold());
-                        
+
                         if (compare != null) {
                                  // AND
                             if ((conjunctive &&
@@ -1794,10 +1794,10 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                 // if bc is a lower/higher value or lte vs lt, use it instead
                 else if ((other instanceof LessThan || other instanceof LessThanOrEqual) &&
                         (main instanceof LessThan || main instanceof LessThanOrEqual)) {
-                    
+
                     if (main.left().semanticEquals(other.left())) {
                         Integer compare = BinaryComparison.compare(value, other.right().fold());
-                        
+
                         if (compare != null) {
                                  // AND
                             if ((conjunctive &&
@@ -1814,7 +1814,7 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                                   (compare == 0 && main instanceof LessThanOrEqual && other instanceof LessThan)))) {
                                 bcs.remove(i);
                                 bcs.add(i, main);
-                                
+
                             }
                             // found a match
                             return true;
@@ -1824,7 +1824,7 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
                     }
                 }
             }
-                
+
             return false;
         }
     }
@@ -1951,5 +1951,5 @@ public class Optimizer extends RuleExecutor<LogicalPlan> {
 
     enum TransformDirection {
         UP, DOWN
-    };
+    }
 }
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlParser.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlParser.java
index e414abef8da..0bc02c1ba6f 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlParser.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/SqlParser.java
@@ -132,7 +132,7 @@ public class SqlParser {
                 log.info(format(Locale.ROOT, "  %-15s '%s'",
                         symbolicName == null ? literalName : symbolicName,
                         t.getText()));
-            };
+            }
         }
 
         ParserRuleContext tree = parseFunction.apply(parser);
@@ -145,7 +145,7 @@ public class SqlParser {
     }
 
     private static void debug(SqlBaseParser parser) {
-        
+
         // when debugging, use the exact prediction mode (needed for diagnostics as well)
         parser.getInterpreter().setPredictionMode(PredictionMode.LL_EXACT_AMBIG_DETECTION);
 
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/session/Cursors.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/session/Cursors.java
index 25989ab0af7..6a3de2cf174 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/session/Cursors.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/session/Cursors.java
@@ -35,7 +35,7 @@ public final class Cursors {
 
     private static final NamedWriteableRegistry WRITEABLE_REGISTRY = new NamedWriteableRegistry(getNamedWriteables());
 
-    private Cursors() {};
+    private Cursors() {}
 
     /**
      * The {@link NamedWriteable}s required to deserialize {@link Cursor}s.