You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2023/11/14 17:39:57 UTC

(lucene) branch branch_9x updated: Remove angry errant lurking semicolons (#12805)

This is an automated email from the ASF dual-hosted git repository.

mikemccand pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 483ad5e7ffd Remove angry errant lurking semicolons (#12805)
483ad5e7ffd is described below

commit 483ad5e7ffd0f57c30b25b9156d422c52e9202de
Author: Michael McCandless <mi...@apache.org>
AuthorDate: Tue Nov 14 12:34:46 2023 -0500

    Remove angry errant lurking semicolons (#12805)
    
    * remove angry errant lurking semicolons
    
    * tidy
    
    * #12805: woops, put back ; from autogen'd QueryParser.java
---
 .../src/java/org/apache/lucene/analysis/en/KStemmer.java     |  1 -
 .../lucene/analysis/miscellaneous/WordDelimiterFilter.java   |  1 -
 .../analysis/miscellaneous/WordDelimiterGraphFilter.java     |  1 -
 .../org/apache/lucene/analysis/synonym/SynonymFilter.java    |  1 -
 .../lucene/analysis/charfilter/TestHTMLStripCharFilter.java  |  3 +--
 .../apache/lucene/analysis/core/TestDuelingAnalyzers.java    |  1 -
 .../org/apache/lucene/analysis/in/TestIndicNormalizer.java   |  1 -
 .../miscellaneous/TestKeywordMarkerFilterFactory.java        |  1 -
 .../apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java |  1 -
 .../apache/lucene/analysis/util/TestCharArrayIterator.java   |  3 +--
 .../org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java |  9 +++------
 .../org/apache/lucene/analysis/pl/TestPolishAnalyzer.java    |  1 -
 .../codecs/simpletext/SimpleTextStoredFieldsFormat.java      |  1 -
 .../src/java/org/apache/lucene/codecs/TermVectorsWriter.java |  2 --
 .../lucene/codecs/perfield/PerFieldPostingsFormat.java       |  1 -
 .../src/java/org/apache/lucene/document/FeatureField.java    |  1 -
 .../src/java/org/apache/lucene/document/SpatialQuery.java    |  2 +-
 lucene/core/src/java/org/apache/lucene/geo/Tessellator.java  |  3 +--
 .../src/java/org/apache/lucene/index/FieldUpdatesBuffer.java |  1 -
 .../core/src/java/org/apache/lucene/index/PointValues.java   |  1 -
 .../src/java/org/apache/lucene/index/ReadersAndUpdates.java  |  1 -
 .../src/java/org/apache/lucene/search/PointInSetQuery.java   |  1 -
 .../apache/lucene/search/similarities/AxiomaticF3LOG.java    |  1 -
 .../src/java/org/apache/lucene/store/BufferedIndexInput.java |  1 -
 .../java/org/apache/lucene/store/ByteBuffersDataInput.java   |  1 -
 .../java/org/apache/lucene/store/ByteBuffersDataOutput.java  |  2 --
 lucene/core/src/java/org/apache/lucene/util/CharsRef.java    |  1 -
 lucene/core/src/java/org/apache/lucene/util/Counter.java     |  1 -
 lucene/core/src/java/org/apache/lucene/util/PagedBytes.java  |  1 -
 .../src/java/org/apache/lucene/util/automaton/Automaton.java |  3 ---
 .../apache/lucene/util/automaton/LevenshteinAutomata.java    |  1 -
 .../src/java/org/apache/lucene/util/fst/PairOutputs.java     |  1 -
 .../src/java/org/apache/lucene/util/hppc/IntIntHashMap.java  |  1 -
 .../src/java/org/apache/lucene/util/packed/DirectReader.java |  1 -
 .../org/apache/lucene/document/BaseLatLonPointTestCase.java  |  1 -
 .../org/apache/lucene/document/BaseLatLonShapeTestCase.java  |  1 -
 .../src/test/org/apache/lucene/index/TestByteSlicePool.java  |  6 ++----
 .../src/test/org/apache/lucene/index/TestIndexWriter.java    |  2 --
 .../org/apache/lucene/search/TestComplexExplanations.java    |  6 ------
 .../src/test/org/apache/lucene/search/TestTermQuery.java     |  1 -
 .../test/org/apache/lucene/search/TestWildcardRandom.java    |  1 -
 .../org/apache/lucene/store/TestByteBuffersDataInput.java    |  1 -
 .../src/test/org/apache/lucene/util/SelectorBenchmark.java   |  1 +
 .../src/test/org/apache/lucene/util/SorterBenchmark.java     |  1 +
 lucene/core/src/test/org/apache/lucene/util/TestVersion.java |  1 -
 .../src/test/org/apache/lucene/util/TestWeakIdentityMap.java |  3 +--
 .../test/org/apache/lucene/util/automaton/TestRegExp.java    |  1 -
 .../test/org/apache/lucene/util/hppc/TestIntIntHashMap.java  |  1 -
 .../lucene/search/join/GlobalOrdinalsWithScoreCollector.java |  1 -
 .../lucene/search/join/ToParentBlockJoinSortField.java       |  1 -
 .../luke/app/desktop/components/DocumentsPanelProvider.java  |  1 -
 .../lucene/index/memory/TestMemoryIndexAgainstDirectory.java |  1 -
 .../org/apache/lucene/monitor/MonitorUpdateListener.java     |  5 -----
 .../apache/lucene/queries/spans/TestSpanExplanations.java    | 12 ++++++------
 .../test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java |  3 +--
 .../lucene/spatial/prefix/tree/PackedQuadPrefixTree.java     |  3 +--
 .../lucene/tests/index/BaseKnnVectorsFormatTestCase.java     |  3 +--
 57 files changed, 21 insertions(+), 89 deletions(-)

diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
index 204d7e53eea..651050d1de7 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
@@ -777,7 +777,6 @@ public class KStemmer {
   private int stemLength() {
     return j + 1;
   }
-  ;
 
   private boolean endsIn(char[] s) {
     if (s.length > k) return false;
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java
index d19a97f06d5..24dc38ef664 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java
@@ -163,7 +163,6 @@ public final class WordDelimiterFilter extends TokenFilter {
 
   private final CharTermAttribute termAttribute = addAttribute(CharTermAttribute.class);
   private final KeywordAttribute keywordAttribute = addAttribute(KeywordAttribute.class);
-  ;
   private final OffsetAttribute offsetAttribute = addAttribute(OffsetAttribute.class);
   private final PositionIncrementAttribute posIncAttribute =
       addAttribute(PositionIncrementAttribute.class);
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterGraphFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterGraphFilter.java
index 8b871d3f2e9..e9a563fecf1 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterGraphFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterGraphFilter.java
@@ -164,7 +164,6 @@ public final class WordDelimiterGraphFilter extends TokenFilter {
 
   private final CharTermAttribute termAttribute = addAttribute(CharTermAttribute.class);
   private final KeywordAttribute keywordAttribute = addAttribute(KeywordAttribute.class);
-  ;
   private final OffsetAttribute offsetAttribute = addAttribute(OffsetAttribute.class);
   private final PositionIncrementAttribute posIncAttribute =
       addAttribute(PositionIncrementAttribute.class);
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
index d3eb6165f74..51298c42a49 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
@@ -216,7 +216,6 @@ public final class SynonymFilter extends TokenFilter {
       count++;
     }
   }
-  ;
 
   private final ByteArrayDataInput bytesReader = new ByteArrayDataInput();
 
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java
index 82b3d25dd1d..2b5340dd3d6 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java
@@ -595,8 +595,7 @@ public class TestHTMLStripCharFilter extends BaseTokenStreamTestCase {
         }
     }
     Reader reader = new HTMLStripCharFilter(new StringReader(text.toString()));
-    while (reader.read() != -1)
-      ;
+    while (reader.read() != -1) {}
   }
 
   public void testUTF16Surrogates() throws Exception {
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java
index 8f336c269da..0359400c669 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java
@@ -230,7 +230,6 @@ public class TestDuelingAnalyzers extends BaseTokenStreamTestCase {
       assertEquals(
           "wrong end offset for input: " + s, leftOffset.endOffset(), rightOffset.endOffset());
     }
-    ;
     assertFalse("wrong number of tokens for input: " + s, right.incrementToken());
     left.end();
     right.end();
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
index e214620c61e..1dbc0528a70 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
@@ -41,7 +41,6 @@ public class TestIndicNormalizer extends BaseTokenStreamTestCase {
 
   private void check(String input, String output) throws IOException {
     Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, false);
-    ;
     tokenizer.setReader(new StringReader(input));
     TokenFilter tf = new IndicNormalizationFilter(tokenizer);
     assertTokenStreamContents(tf, new String[] {output});
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java
index 166b4b7b1ef..a8372181f39 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java
@@ -89,7 +89,6 @@ public class TestKeywordMarkerFilterFactory extends BaseTokenStreamFactoryTestCa
     stream =
         tokenFilterFactory("KeywordMarker", "pattern", "Cats", "ignoreCase", "true").create(stream);
     stream = tokenFilterFactory("PorterStem").create(stream);
-    ;
     assertTokenStreamContents(stream, new String[] {"dog", "cats", "Cats"});
   }
 
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java
index 434a552eaf7..0cc41a51876 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestEdgeNGramTokenizer.java
@@ -69,7 +69,6 @@ public class TestEdgeNGramTokenizer extends BaseTokenStreamTestCase {
   public void testOversizedNgrams() throws Exception {
     EdgeNGramTokenizer tokenizer = new EdgeNGramTokenizer(6, 6);
     tokenizer.setReader(input);
-    ;
     assertTokenStreamContents(tokenizer, new String[0], new int[0], new int[0], 5 /* abcde */);
   }
 
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java
index 13a02f0369e..c1abf9e3615 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java
@@ -156,7 +156,6 @@ public class TestCharArrayIterator extends LuceneTestCase {
 
   private void consume(BreakIterator bi, CharacterIterator ci) {
     bi.setText(ci);
-    while (bi.next() != BreakIterator.DONE)
-      ;
+    while (bi.next() != BreakIterator.DONE) {}
   }
 }
diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
index 82bad55013a..0c2acac9612 100644
--- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
+++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
@@ -784,8 +784,7 @@ public class TestJapaneseTokenizer extends BaseTokenStreamTestCase {
     for (int i = 0; i < numIterations; i++) {
       try (TokenStream ts = analyzer.tokenStream("ignored", line)) {
         ts.reset();
-        while (ts.incrementToken())
-          ;
+        while (ts.incrementToken()) {}
         ts.end();
       }
     }
@@ -801,8 +800,7 @@ public class TestJapaneseTokenizer extends BaseTokenStreamTestCase {
       for (String sentence : sentences) {
         try (TokenStream ts = analyzer.tokenStream("ignored", sentence)) {
           ts.reset();
-          while (ts.incrementToken())
-            ;
+          while (ts.incrementToken()) {}
           ts.end();
         }
       }
@@ -857,8 +855,7 @@ public class TestJapaneseTokenizer extends BaseTokenStreamTestCase {
         new JapaneseTokenizer(newAttributeFactory(), readDict(), false, Mode.NORMAL);
     tokenizer.setReader(new StringReader(doc));
     tokenizer.reset();
-    while (tokenizer.incrementToken())
-      ;
+    while (tokenizer.incrementToken()) {}
   }
 
   public void testPatchedSystemDict() throws Exception {
diff --git a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java
index c1687cc119d..c4f808b52ca 100644
--- a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java
+++ b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java
@@ -41,7 +41,6 @@ public class TestPolishAnalyzer extends BaseTokenStreamTestCase {
   /** test use of exclusion set */
   public void testExclude() throws IOException {
     CharArraySet exclusionSet = new CharArraySet(asSet("studenta"), false);
-    ;
     Analyzer a = new PolishAnalyzer(PolishAnalyzer.getDefaultStopSet(), exclusionSet);
     checkOneTerm(a, "studenta", "studenta");
     checkOneTerm(a, "studenci", "student");
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java
index 34b24d8fce0..50ce5987eba 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java
@@ -37,7 +37,6 @@ public class SimpleTextStoredFieldsFormat extends StoredFieldsFormat {
   @Override
   public StoredFieldsReader fieldsReader(
       Directory directory, SegmentInfo si, FieldInfos fn, IOContext context) throws IOException {
-    ;
     return new SimpleTextStoredFieldsReader(directory, si, fn, context);
   }
 
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
index 5a5a4e672be..f6d672aa41b 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
@@ -70,7 +70,6 @@ public abstract class TermVectorsWriter implements Closeable, Accountable {
 
   /** Called after a doc and all its fields have been added. */
   public void finishDocument() throws IOException {}
-  ;
 
   /**
    * Called before writing the terms of the field. {@link #startTerm(BytesRef, int)} will be called
@@ -82,7 +81,6 @@ public abstract class TermVectorsWriter implements Closeable, Accountable {
 
   /** Called after a field and all its terms have been added. */
   public void finishField() throws IOException {}
-  ;
 
   /**
    * Adds a term and its term frequency <code>freq</code>. If this field has positions and/or
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
index f86bd3bad35..93cdecd9483 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
@@ -119,7 +119,6 @@ public abstract class PerFieldPostingsFormat extends PostingsFormat {
       }
     }
   }
-  ;
 
   static String getSuffix(String formatName, String suffix) {
     return formatName + "_" + suffix;
diff --git a/lucene/core/src/java/org/apache/lucene/document/FeatureField.java b/lucene/core/src/java/org/apache/lucene/document/FeatureField.java
index 53edaad0eac..d70ead22d83 100644
--- a/lucene/core/src/java/org/apache/lucene/document/FeatureField.java
+++ b/lucene/core/src/java/org/apache/lucene/document/FeatureField.java
@@ -272,7 +272,6 @@ public final class FeatureField extends Field {
       return true;
     }
   }
-  ;
 
   static final class LogFunction extends FeatureFunction {
 
diff --git a/lucene/core/src/java/org/apache/lucene/document/SpatialQuery.java b/lucene/core/src/java/org/apache/lucene/document/SpatialQuery.java
index d7c100776b3..e1fd11efce8 100644
--- a/lucene/core/src/java/org/apache/lucene/document/SpatialQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/document/SpatialQuery.java
@@ -694,7 +694,7 @@ abstract class SpatialQuery extends Query {
       final SpatialVisitor spatialVisitor, QueryRelation queryRelation, final FixedBitSet result) {
     final BiFunction<byte[], byte[], Relation> innerFunction =
         spatialVisitor.getInnerFunction(queryRelation);
-    ;
+
     return new IntersectVisitor() {
 
       @Override
diff --git a/lucene/core/src/java/org/apache/lucene/geo/Tessellator.java b/lucene/core/src/java/org/apache/lucene/geo/Tessellator.java
index ae0190f9d45..128295f037a 100644
--- a/lucene/core/src/java/org/apache/lucene/geo/Tessellator.java
+++ b/lucene/core/src/java/org/apache/lucene/geo/Tessellator.java
@@ -1254,8 +1254,7 @@ public final class Tessellator {
         ++numMerges;
         // step 'insize' places along from p
         q = p;
-        for (i = 0, pSize = 0; i < inSize && q != null; ++i, ++pSize, q = q.nextZ)
-          ;
+        for (i = 0, pSize = 0; i < inSize && q != null; ++i, ++pSize, q = q.nextZ) {}
         // if q hasn't fallen off end, we have two lists to merge
         qSize = inSize;
 
diff --git a/lucene/core/src/java/org/apache/lucene/index/FieldUpdatesBuffer.java b/lucene/core/src/java/org/apache/lucene/index/FieldUpdatesBuffer.java
index 5190f35c93e..9739df9cd83 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FieldUpdatesBuffer.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FieldUpdatesBuffer.java
@@ -270,7 +270,6 @@ final class FieldUpdatesBuffer {
   static class BufferedUpdate {
 
     private BufferedUpdate() {}
-    ;
 
     /** the max document ID this update should be applied to */
     int docUpTo;
diff --git a/lucene/core/src/java/org/apache/lucene/index/PointValues.java b/lucene/core/src/java/org/apache/lucene/index/PointValues.java
index 64229d18936..2bc2173560b 100644
--- a/lucene/core/src/java/org/apache/lucene/index/PointValues.java
+++ b/lucene/core/src/java/org/apache/lucene/index/PointValues.java
@@ -325,7 +325,6 @@ public abstract class PointValues {
 
     /** Notifies the caller that this many documents are about to be visited */
     default void grow(int count) {}
-    ;
   }
 
   /**
diff --git a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
index 9713923916b..04306c024cb 100644
--- a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
+++ b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
@@ -526,7 +526,6 @@ final class ReadersAndUpdates {
       return docIDOut;
     }
   }
-  ;
 
   private synchronized Set<String> writeFieldInfosGen(
       FieldInfos fieldInfos, Directory dir, FieldInfosFormat infosFormat) throws IOException {
diff --git a/lucene/core/src/java/org/apache/lucene/search/PointInSetQuery.java b/lucene/core/src/java/org/apache/lucene/search/PointInSetQuery.java
index a092bbafcf7..0779e8599e7 100644
--- a/lucene/core/src/java/org/apache/lucene/search/PointInSetQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/PointInSetQuery.java
@@ -69,7 +69,6 @@ public abstract class PointInSetQuery extends Query implements Accountable {
     @Override
     public abstract BytesRef next();
   }
-  ;
 
   /** The {@code packedPoints} iterator must be in sorted order. */
   protected PointInSetQuery(String field, int numDims, int bytesPerDim, Stream packedPoints) {
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF3LOG.java b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF3LOG.java
index e0622743cc7..0e26f53ace7 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF3LOG.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF3LOG.java
@@ -81,7 +81,6 @@ public class AxiomaticF3LOG extends Axiomatic {
         "tf, term frequency computed as 1 + log(1 + log(freq)) from:",
         Explanation.match((float) freq, "freq, number of occurrences of term in the document"));
   }
-  ;
 
   @Override
   protected Explanation lnExplain(BasicStats stats, double freq, double docLen) {
diff --git a/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java b/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java
index 212da11a375..34ea58c5073 100644
--- a/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java
+++ b/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java
@@ -26,7 +26,6 @@ public abstract class BufferedIndexInput extends IndexInput implements RandomAcc
 
   private static final ByteBuffer EMPTY_BYTEBUFFER =
       ByteBuffer.allocate(0).order(ByteOrder.LITTLE_ENDIAN);
-  ;
 
   /** Default buffer size set to {@value #BUFFER_SIZE}. */
   public static final int BUFFER_SIZE = 1024;
diff --git a/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataInput.java b/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataInput.java
index 1fac3fe9379..1990e9507ee 100644
--- a/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataInput.java
+++ b/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataInput.java
@@ -472,7 +472,6 @@ public final class ByteBuffersDataInput extends DataInput
 
     if (buffers.size() == 1) {
       ByteBuffer cloned = buffers.get(0).asReadOnlyBuffer().order(ByteOrder.LITTLE_ENDIAN);
-      ;
       cloned.position(Math.toIntExact(cloned.position() + offset));
       cloned.limit(Math.toIntExact(cloned.position() + length));
       return Arrays.asList(cloned);
diff --git a/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataOutput.java b/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataOutput.java
index 08894d6c4ec..eaa0929848d 100644
--- a/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataOutput.java
+++ b/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataOutput.java
@@ -241,7 +241,6 @@ public final class ByteBuffersDataOutput extends DataOutput implements Accountab
     } else {
       for (ByteBuffer bb : blocks) {
         bb = bb.asReadOnlyBuffer().flip().order(ByteOrder.LITTLE_ENDIAN);
-        ;
         result.add(bb);
       }
     }
@@ -501,7 +500,6 @@ public final class ByteBuffersDataOutput extends DataOutput implements Accountab
 
     final int requiredBlockSize = 1 << blockBits;
     currentBlock = blockAllocate.apply(requiredBlockSize).order(ByteOrder.LITTLE_ENDIAN);
-    ;
     assert currentBlock.capacity() == requiredBlockSize;
     blocks.add(currentBlock);
     ramBytesUsed += RamUsageEstimator.NUM_BYTES_OBJECT_REF + currentBlock.capacity();
diff --git a/lucene/core/src/java/org/apache/lucene/util/CharsRef.java b/lucene/core/src/java/org/apache/lucene/util/CharsRef.java
index 27a9027c648..36999c61def 100644
--- a/lucene/core/src/java/org/apache/lucene/util/CharsRef.java
+++ b/lucene/core/src/java/org/apache/lucene/util/CharsRef.java
@@ -172,7 +172,6 @@ public final class CharsRef implements Comparable<CharsRef>, CharSequence, Clone
   private static class UTF16SortedAsUTF8Comparator implements Comparator<CharsRef> {
     // Only singleton
     private UTF16SortedAsUTF8Comparator() {}
-    ;
 
     @Override
     public int compare(CharsRef a, CharsRef b) {
diff --git a/lucene/core/src/java/org/apache/lucene/util/Counter.java b/lucene/core/src/java/org/apache/lucene/util/Counter.java
index 58407491550..809dc0d0bb4 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Counter.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Counter.java
@@ -69,7 +69,6 @@ public abstract class Counter {
     public long get() {
       return count;
     }
-    ;
   }
 
   private static final class AtomicCounter extends Counter {
diff --git a/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java b/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
index 134fa11560a..e63b75418f9 100644
--- a/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
+++ b/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
@@ -250,7 +250,6 @@ public final class PagedBytes implements Accountable {
   @Override
   public long ramBytesUsed() {
     long size = BASE_RAM_BYTES_USED + RamUsageEstimator.shallowSizeOf(blocks);
-    ;
     if (numBlocks > 0) {
       size += (numBlocks - 1) * bytesUsedPerBlock;
       size += RamUsageEstimator.sizeOf(blocks[numBlocks - 1]);
diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java
index edff357f252..d6f0d3c4698 100644
--- a/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java
+++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java
@@ -378,7 +378,6 @@ public class Automaton implements Accountable {
           swapOne(iStart + 1, jStart + 1);
           swapOne(iStart + 2, jStart + 2);
         }
-        ;
 
         @Override
         protected int compare(int i, int j) {
@@ -434,7 +433,6 @@ public class Automaton implements Accountable {
           swapOne(iStart + 1, jStart + 1);
           swapOne(iStart + 2, jStart + 2);
         }
-        ;
 
         @Override
         protected int compare(int i, int j) {
@@ -816,7 +814,6 @@ public class Automaton implements Accountable {
             swapOne(iStart + 2, jStart + 2);
             swapOne(iStart + 3, jStart + 3);
           }
-          ;
 
           @Override
           protected int compare(int i, int j) {
diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java b/lucene/core/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java
index 2e42f2e8551..83c51cf56d5 100644
--- a/lucene/core/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java
+++ b/lucene/core/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java
@@ -263,7 +263,6 @@ public class LevenshteinAutomata {
     int size() {
       return minErrors.length * (w + 1);
     }
-    ;
 
     /**
      * Returns true if the <code>state</code> in any Levenshtein DFA is an accept state (final
diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java b/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java
index 1300fc2e447..0bb9f77e17d 100644
--- a/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java
+++ b/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java
@@ -66,7 +66,6 @@ public class PairOutputs<A, B> extends Outputs<PairOutputs.Pair<A, B>> {
       return "Pair(" + output1 + "," + output2 + ")";
     }
   }
-  ;
 
   public PairOutputs(Outputs<A> outputs1, Outputs<B> outputs2) {
     this.outputs1 = outputs1;
diff --git a/lucene/core/src/java/org/apache/lucene/util/hppc/IntIntHashMap.java b/lucene/core/src/java/org/apache/lucene/util/hppc/IntIntHashMap.java
index 95d5a17c7dd..678843960e6 100644
--- a/lucene/core/src/java/org/apache/lucene/util/hppc/IntIntHashMap.java
+++ b/lucene/core/src/java/org/apache/lucene/util/hppc/IntIntHashMap.java
@@ -523,7 +523,6 @@ public class IntIntHashMap implements Iterable<IntIntHashMap.IntIntCursor>, Clon
       return new KeysIterator();
     }
   }
-  ;
 
   /** An iterator over the set of assigned keys. */
   private final class KeysIterator extends AbstractIterator<IntCursor> {
diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java
index b12505e737e..26622cf2642 100644
--- a/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java
+++ b/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java
@@ -233,7 +233,6 @@ public class DirectReader {
     DirectPackedReader4(RandomAccessInput in, long offset) {
       this.in = in;
       this.offset = offset;
-      ;
     }
 
     @Override
diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java
index 938168acf1d..1bbf6a5c2ba 100644
--- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java
+++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonPointTestCase.java
@@ -128,7 +128,6 @@ public abstract class BaseLatLonPointTestCase extends BaseLatLonSpatialTestCase
     }
     // different shape
     Polygon newPolygon = GeoTestUtil.nextPolygon();
-    ;
     Query q5 = newPolygonQuery(fieldName, queryRelation, newPolygon);
     if (polygon.equals(newPolygon)) {
       QueryUtils.checkEqual(q1, q5);
diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java
index 7caf03ae978..b70b5ee9aa0 100644
--- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java
+++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonShapeTestCase.java
@@ -230,7 +230,6 @@ public abstract class BaseLatLonShapeTestCase extends BaseLatLonSpatialTestCase
     }
     // different shape
     Polygon newPolygon = GeoTestUtil.nextPolygon();
-    ;
     Query q5 = newPolygonQuery(fieldName, queryRelation, newPolygon);
     if (polygon.equals(newPolygon)) {
       QueryUtils.checkEqual(q1, q5);
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestByteSlicePool.java b/lucene/core/src/test/org/apache/lucene/index/TestByteSlicePool.java
index ac9559991ce..50fccd3b451 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestByteSlicePool.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestByteSlicePool.java
@@ -245,8 +245,7 @@ public class TestByteSlicePool extends LuceneTestCase {
         boolean succeeded = sliceWriters[i].writeSlice();
         if (succeeded == false) {
           for (int j = 0; j < n; j++) {
-            while (sliceWriters[j].writeSlice())
-              ;
+            while (sliceWriters[j].writeSlice()) {}
           }
           break;
         }
@@ -268,8 +267,7 @@ public class TestByteSlicePool extends LuceneTestCase {
         boolean succeeded = sliceReaders[i].readSlice();
         if (succeeded == false) {
           for (int j = 0; j < n; j++) {
-            while (sliceReaders[j].readSlice())
-              ;
+            while (sliceReaders[j].readSlice()) {}
           }
           break;
         }
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
index c12c1de4246..72ade33ecf0 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -3035,7 +3035,6 @@ public class TestIndexWriter extends LuceneTestCase {
         assertEquals(1, writer.getDocStats().maxDoc);
         // now check that we moved to 3
         dir.openInput("segments_3", IOContext.READ).close();
-        ;
       }
       reader.close();
       in.close();
@@ -3768,7 +3767,6 @@ public class TestIndexWriter extends LuceneTestCase {
       try (IndexReader reader = DirectoryReader.open(writer)) {
         assertEquals(1, reader.numDocs());
       }
-      ;
       t.join();
     }
   }
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
index da18b5091d0..0f917aad01d 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
@@ -76,7 +76,6 @@ public class TestComplexExplanations extends BaseExplanationTestCase {
 
   public void testDMQ10() throws Exception {
     BooleanQuery.Builder query = new BooleanQuery.Builder();
-    ;
     query.add(new TermQuery(new Term(FIELD, "yy")), Occur.SHOULD);
     TermQuery boostedQuery = new TermQuery(new Term(FIELD, "w5"));
     query.add(new BoostQuery(boostedQuery, 100), Occur.SHOULD);
@@ -100,7 +99,6 @@ public class TestComplexExplanations extends BaseExplanationTestCase {
   public void testBQ12() throws Exception {
     // NOTE: using qtest not bqtest
     BooleanQuery.Builder query = new BooleanQuery.Builder();
-    ;
     query.add(new TermQuery(new Term(FIELD, "w1")), Occur.SHOULD);
     TermQuery boostedQuery = new TermQuery(new Term(FIELD, "w2"));
     query.add(new BoostQuery(boostedQuery, 0), Occur.SHOULD);
@@ -111,7 +109,6 @@ public class TestComplexExplanations extends BaseExplanationTestCase {
   public void testBQ13() throws Exception {
     // NOTE: using qtest not bqtest
     BooleanQuery.Builder query = new BooleanQuery.Builder();
-    ;
     query.add(new TermQuery(new Term(FIELD, "w1")), Occur.SHOULD);
     TermQuery boostedQuery = new TermQuery(new Term(FIELD, "w5"));
     query.add(new BoostQuery(boostedQuery, 0), Occur.MUST_NOT);
@@ -122,7 +119,6 @@ public class TestComplexExplanations extends BaseExplanationTestCase {
   public void testBQ18() throws Exception {
     // NOTE: using qtest not bqtest
     BooleanQuery.Builder query = new BooleanQuery.Builder();
-    ;
     TermQuery boostedQuery = new TermQuery(new Term(FIELD, "w1"));
     query.add(new BoostQuery(boostedQuery, 0), Occur.MUST);
     query.add(new TermQuery(new Term(FIELD, "w2")), Occur.SHOULD);
@@ -132,7 +128,6 @@ public class TestComplexExplanations extends BaseExplanationTestCase {
 
   public void testBQ21() throws Exception {
     BooleanQuery.Builder builder = new BooleanQuery.Builder();
-    ;
     builder.add(new TermQuery(new Term(FIELD, "w1")), Occur.MUST);
     builder.add(new TermQuery(new Term(FIELD, "w2")), Occur.SHOULD);
 
@@ -143,7 +138,6 @@ public class TestComplexExplanations extends BaseExplanationTestCase {
 
   public void testBQ22() throws Exception {
     BooleanQuery.Builder builder = new BooleanQuery.Builder();
-    ;
     TermQuery boostedQuery = new TermQuery(new Term(FIELD, "w1"));
     builder.add(new BoostQuery(boostedQuery, 0), Occur.MUST);
     builder.add(new TermQuery(new Term(FIELD, "w2")), Occur.SHOULD);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java
index 72e8792b1be..3b35f67cad1 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTermQuery.java
@@ -288,5 +288,4 @@ public class TestTermQuery extends LuceneTestCase {
       return in.getReaderCacheHelper();
     }
   }
-  ;
 }
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
index f41185c57fe..36e0515f70c 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
@@ -105,7 +105,6 @@ public class TestWildcardRandom extends LuceneTestCase {
   }
 
   public void testWildcards() throws Exception {
-    ;
     int num = atLeast(1);
     for (int i = 0; i < num; i++) {
       assertPatternHits("NNN", 1);
diff --git a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataInput.java b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataInput.java
index 446cadee0ec..d078b142f36 100644
--- a/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataInput.java
+++ b/lucene/core/src/test/org/apache/lucene/store/TestByteBuffersDataInput.java
@@ -204,7 +204,6 @@ public final class TestByteBuffersDataInput extends RandomizedTest {
   public void testSlicingWindow() throws Exception {
     ByteBuffersDataOutput dst = new ByteBuffersDataOutput();
     assertEquals(0, dst.toDataInput().slice(0, 0).size());
-    ;
 
     dst.writeBytes(randomBytesOfLength(1024 * 8));
     ByteBuffersDataInput in = dst.toDataInput();
diff --git a/lucene/core/src/test/org/apache/lucene/util/SelectorBenchmark.java b/lucene/core/src/test/org/apache/lucene/util/SelectorBenchmark.java
index bf5524a7585..a096b4d6700 100644
--- a/lucene/core/src/test/org/apache/lucene/util/SelectorBenchmark.java
+++ b/lucene/core/src/test/org/apache/lucene/util/SelectorBenchmark.java
@@ -58,6 +58,7 @@ public class SelectorBenchmark {
           };
         }),
     ;
+
     final String name;
     final Builder builder;
 
diff --git a/lucene/core/src/test/org/apache/lucene/util/SorterBenchmark.java b/lucene/core/src/test/org/apache/lucene/util/SorterBenchmark.java
index 7aae8758d84..6106ab069f8 100644
--- a/lucene/core/src/test/org/apache/lucene/util/SorterBenchmark.java
+++ b/lucene/core/src/test/org/apache/lucene/util/SorterBenchmark.java
@@ -50,6 +50,7 @@ public class SorterBenchmark {
           return new ArrayInPlaceMergeSorter<>(arr, Entry::compareTo);
         }),
     ;
+
     final String name;
     final Builder builder;
 
diff --git a/lucene/core/src/test/org/apache/lucene/util/TestVersion.java b/lucene/core/src/test/org/apache/lucene/util/TestVersion.java
index 16f120ec992..8228883fb41 100644
--- a/lucene/core/src/test/org/apache/lucene/util/TestVersion.java
+++ b/lucene/core/src/test/org/apache/lucene/util/TestVersion.java
@@ -34,7 +34,6 @@ public class TestVersion extends LuceneTestCase {
       }
     }
     assertTrue(Version.LUCENE_9_0_0.onOrAfter(Version.LUCENE_8_0_0));
-    ;
   }
 
   public void testToString() {
diff --git a/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java b/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java
index 3db8540e30a..606f24867eb 100644
--- a/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java
+++ b/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java
@@ -219,8 +219,7 @@ public class TestWeakIdentityMap extends LuceneTestCase {
       }
     } finally {
       exec.shutdown();
-      while (!exec.awaitTermination(1000L, TimeUnit.MILLISECONDS))
-        ;
+      while (!exec.awaitTermination(1000L, TimeUnit.MILLISECONDS)) {}
     }
 
     // clear strong refs
diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java
index 7ad792e869f..d50feeba09e 100644
--- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java
+++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java
@@ -262,7 +262,6 @@ public class TestRegExp extends LuceneTestCase {
         caseSensitiveQuery
             ? Pattern.compile(regexPattern)
             : Pattern.compile(regexPattern, Pattern.CASE_INSENSITIVE);
-    ;
     Matcher matcher = pattern.matcher(docValue);
     assertTrue(
         "Java regex " + regexPattern + " did not match doc value " + docValue, matcher.matches());
diff --git a/lucene/core/src/test/org/apache/lucene/util/hppc/TestIntIntHashMap.java b/lucene/core/src/test/org/apache/lucene/util/hppc/TestIntIntHashMap.java
index 5a8598ac733..a72c6e77e68 100644
--- a/lucene/core/src/test/org/apache/lucene/util/hppc/TestIntIntHashMap.java
+++ b/lucene/core/src/test/org/apache/lucene/util/hppc/TestIntIntHashMap.java
@@ -612,7 +612,6 @@ public class TestIntIntHashMap extends LuceneTestCase {
   @Test
   public void testEqualsSubClass() {
     class Sub extends IntIntHashMap {}
-    ;
 
     IntIntHashMap l1 = newInstance();
     l1.put(k1, value0);
diff --git a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreCollector.java b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreCollector.java
index 5b21ba7f76d..27becea124e 100644
--- a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreCollector.java
+++ b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreCollector.java
@@ -50,7 +50,6 @@ abstract class GlobalOrdinalsWithScoreCollector implements Collector {
     this.doMinMax = min > 1 || max < Integer.MAX_VALUE;
     this.min = min;
     this.max = max;
-    ;
     this.ordinalMap = ordinalMap;
     this.collectedOrds = new LongBitSet(valueCount);
     if (scoreMode != ScoreMode.None) {
diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java
index f36841c6f79..b3d70320b6f 100644
--- a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java
+++ b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java
@@ -233,7 +233,6 @@ public class ToParentBlockJoinSortField extends SortField {
           }
         };
       }
-      ;
     };
   }
 
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java
index 56774640848..d02bfee890b 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/DocumentsPanelProvider.java
@@ -834,7 +834,6 @@ public final class DocumentsPanelProvider implements DocumentsTabOperator {
   public void displayDoc(int docid) {
     showDoc(docid);
   }
-  ;
 
   private void showDoc(int docid) {
     docNumSpnr.setValue(docid);
diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java
index 1a5c2729aed..414c6980263 100644
--- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java
+++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java
@@ -283,7 +283,6 @@ public class TestMemoryIndexAgainstDirectory extends BaseTokenStreamTestCase {
       }
     }
   }
-  ;
 
   /**
    * Some terms to be indexed, in addition to random words. These terms are commonly used in the
diff --git a/lucene/monitor/src/java/org/apache/lucene/monitor/MonitorUpdateListener.java b/lucene/monitor/src/java/org/apache/lucene/monitor/MonitorUpdateListener.java
index a502dd71fe9..dde770d5706 100644
--- a/lucene/monitor/src/java/org/apache/lucene/monitor/MonitorUpdateListener.java
+++ b/lucene/monitor/src/java/org/apache/lucene/monitor/MonitorUpdateListener.java
@@ -24,21 +24,16 @@ public interface MonitorUpdateListener {
 
   /** Called after a set of queries have been added to the Monitor's query index */
   default void afterUpdate(List<MonitorQuery> updates) {}
-  ;
 
   /** Called after a set of queries have been deleted from the Monitor's query index */
   default void afterDelete(List<String> queryIds) {}
-  ;
 
   /** Called after all queries have been removed from the Monitor's query index */
   default void afterClear() {}
-  ;
 
   /** Called after the Monitor's query cache has been purged of deleted queries */
   default void onPurge() {}
-  ;
 
   /** Called if there was an error removing deleted queries from the Monitor's query cache */
   default void onPurgeError(Throwable t) {}
-  ;
 }
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanExplanations.java b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanExplanations.java
index 4610ff27702..59be0f62557 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanExplanations.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/spans/TestSpanExplanations.java
@@ -261,7 +261,7 @@ public class TestSpanExplanations extends BaseSpanExplanationTestCase {
     disjuncts.add(new TermQuery(new Term(FIELD, "QQ")));
 
     BooleanQuery.Builder xxYYZZ = new BooleanQuery.Builder();
-    ;
+
     xxYYZZ.add(new TermQuery(new Term(FIELD, "xx")), Occur.SHOULD);
     xxYYZZ.add(new TermQuery(new Term(FIELD, "yy")), Occur.SHOULD);
     xxYYZZ.add(new TermQuery(new Term(FIELD, "zz")), Occur.MUST_NOT);
@@ -269,7 +269,7 @@ public class TestSpanExplanations extends BaseSpanExplanationTestCase {
     disjuncts.add(xxYYZZ.build());
 
     BooleanQuery.Builder xxW1 = new BooleanQuery.Builder();
-    ;
+
     xxW1.add(new TermQuery(new Term(FIELD, "xx")), Occur.MUST_NOT);
     xxW1.add(new TermQuery(new Term(FIELD, "w1")), Occur.MUST_NOT);
 
@@ -284,7 +284,7 @@ public class TestSpanExplanations extends BaseSpanExplanationTestCase {
     q.add(new DisjunctionMaxQuery(disjuncts, 0.2f), Occur.SHOULD);
 
     BooleanQuery.Builder b = new BooleanQuery.Builder();
-    ;
+
     b.setMinimumNumberShouldMatch(2);
     b.add(snear("w1", "w2", 1, true), Occur.SHOULD);
     b.add(snear("w2", "w3", 1, true), Occur.SHOULD);
@@ -319,7 +319,7 @@ public class TestSpanExplanations extends BaseSpanExplanationTestCase {
     disjuncts.add(new TermQuery(new Term(FIELD, "QQ")));
 
     BooleanQuery.Builder xxYYZZ = new BooleanQuery.Builder();
-    ;
+
     xxYYZZ.add(new TermQuery(new Term(FIELD, "xx")), Occur.SHOULD);
     xxYYZZ.add(new TermQuery(new Term(FIELD, "yy")), Occur.SHOULD);
     xxYYZZ.add(new TermQuery(new Term(FIELD, "zz")), Occur.MUST_NOT);
@@ -327,7 +327,7 @@ public class TestSpanExplanations extends BaseSpanExplanationTestCase {
     disjuncts.add(xxYYZZ.build());
 
     BooleanQuery.Builder xxW1 = new BooleanQuery.Builder();
-    ;
+
     xxW1.add(new TermQuery(new Term(FIELD, "xx")), Occur.MUST_NOT);
     xxW1.add(new TermQuery(new Term(FIELD, "w1")), Occur.MUST_NOT);
 
@@ -345,7 +345,7 @@ public class TestSpanExplanations extends BaseSpanExplanationTestCase {
     q.add(new DisjunctionMaxQuery(disjuncts, 0.2f), Occur.SHOULD);
 
     BooleanQuery.Builder builder = new BooleanQuery.Builder();
-    ;
+
     builder.setMinimumNumberShouldMatch(2);
     builder.add(snear("w1", "w2", 1, true), Occur.SHOULD);
     builder.add(snear("w2", "w3", 1, true), Occur.SHOULD);
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java
index ad410989554..d85b644c054 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/SimpleCopyJob.java
@@ -271,8 +271,7 @@ class SimpleCopyJob extends CopyJob {
 
   @Override
   public void runBlocking() throws IOException {
-    while (visit() == false)
-      ;
+    while (visit() == false) {}
 
     if (getFailed()) {
       throw new RuntimeException("copy failed: " + cancelReason, exc);
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/PackedQuadPrefixTree.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/PackedQuadPrefixTree.java
index b74f702c9aa..7ff5cddccd1 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/PackedQuadPrefixTree.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/PackedQuadPrefixTree.java
@@ -522,8 +522,7 @@ public class PackedQuadPrefixTree extends QuadPrefixTree {
       if (rel == SpatialRelation.INTERSECTS && leafyPrune && level == detailLevel - 1) {
         for (leaves = 0, pruneIter = thisCell.getNextLevelCells(shape);
             pruneIter.hasNext();
-            pruneIter.next(), ++leaves)
-          ;
+            pruneIter.next(), ++leaves) {}
         return leaves == 4;
       }
       return false;
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java
index 9518de11571..2225bf544bb 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseKnnVectorsFormatTestCase.java
@@ -1341,8 +1341,7 @@ public abstract class BaseKnnVectorsFormatTestCase extends BaseIndexFileFormatTe
           for (int i = 0; i < numdocs; i++) {
             // randomly advance to i
             if (random().nextInt(4) == 3) {
-              while (vectorDocs[++cur] < i)
-                ;
+              while (vectorDocs[++cur] < i) {}
               assertEquals(vectorDocs[cur], vectorValues.advance(i));
               assertEquals(vectorDocs[cur], vectorValues.docID());
               if (vectorValues.docID() == NO_MORE_DOCS) {