You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2021/03/25 21:50:48 UTC

[lucene] branch main updated: LUCENE-9864: Enforce @Override annotation everywhere (#40)

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 3ed87c8  LUCENE-9864: Enforce @Override annotation everywhere (#40)
3ed87c8 is described below

commit 3ed87c867a6c3edd5d8b5aa1a1dee3264af401aa
Author: zacharymorn <za...@yahoo.com>
AuthorDate: Thu Mar 25 14:50:38 2021 -0700

    LUCENE-9864: Enforce @Override annotation everywhere (#40)
    
    Requiring the annotation is helpful because if an abstract method is removed, the concrete methods will then show up as compile errors: preventing dead code from being accidentally left behind.
    
    Co-authored-by: Robert Muir <rm...@apache.org>
---
 gradle/generation/javacc.gradle                      |  6 ++++++
 gradle/generation/snowball.patch                     | 20 +++++++++++++++++---
 .../eclipse/dot.settings/org.eclipse.jdt.core.prefs  |  1 +
 gradle/validation/ecj-lint/ecj.javadocs.prefs        |  2 +-
 .../org/tartarus/snowball/ext/ArabicStemmer.java     |  1 +
 .../org/tartarus/snowball/ext/ArmenianStemmer.java   |  1 +
 .../org/tartarus/snowball/ext/BasqueStemmer.java     |  1 +
 .../org/tartarus/snowball/ext/CatalanStemmer.java    |  1 +
 .../org/tartarus/snowball/ext/DanishStemmer.java     |  1 +
 .../java/org/tartarus/snowball/ext/DutchStemmer.java |  1 +
 .../org/tartarus/snowball/ext/EnglishStemmer.java    |  1 +
 .../org/tartarus/snowball/ext/EstonianStemmer.java   |  1 +
 .../org/tartarus/snowball/ext/FinnishStemmer.java    |  1 +
 .../org/tartarus/snowball/ext/FrenchStemmer.java     |  1 +
 .../org/tartarus/snowball/ext/German2Stemmer.java    |  1 +
 .../org/tartarus/snowball/ext/GermanStemmer.java     |  1 +
 .../java/org/tartarus/snowball/ext/GreekStemmer.java |  1 +
 .../java/org/tartarus/snowball/ext/HindiStemmer.java |  1 +
 .../org/tartarus/snowball/ext/HungarianStemmer.java  |  1 +
 .../org/tartarus/snowball/ext/IndonesianStemmer.java |  1 +
 .../java/org/tartarus/snowball/ext/IrishStemmer.java |  1 +
 .../org/tartarus/snowball/ext/ItalianStemmer.java    |  1 +
 .../java/org/tartarus/snowball/ext/KpStemmer.java    |  1 +
 .../org/tartarus/snowball/ext/LithuanianStemmer.java |  1 +
 .../org/tartarus/snowball/ext/LovinsStemmer.java     |  1 +
 .../org/tartarus/snowball/ext/NepaliStemmer.java     |  1 +
 .../org/tartarus/snowball/ext/NorwegianStemmer.java  |  1 +
 .../org/tartarus/snowball/ext/PorterStemmer.java     |  1 +
 .../org/tartarus/snowball/ext/PortugueseStemmer.java |  1 +
 .../org/tartarus/snowball/ext/RomanianStemmer.java   |  1 +
 .../org/tartarus/snowball/ext/RussianStemmer.java    |  1 +
 .../org/tartarus/snowball/ext/SerbianStemmer.java    |  1 +
 .../org/tartarus/snowball/ext/SpanishStemmer.java    |  1 +
 .../org/tartarus/snowball/ext/SwedishStemmer.java    |  1 +
 .../java/org/tartarus/snowball/ext/TamilStemmer.java |  1 +
 .../org/tartarus/snowball/ext/TurkishStemmer.java    |  1 +
 .../org/tartarus/snowball/ext/YiddishStemmer.java    |  1 +
 .../compressing/LegacyFieldsIndexReader.java         |  1 +
 .../lucene70/Lucene70DocValuesProducer.java          |  1 +
 .../lucene60/Lucene60PointsWriter.java               |  1 +
 .../classification/CachingNaiveBayesClassifier.java  |  1 +
 .../apache/lucene/codecs/memory/FSTTermsReader.java  |  1 +
 .../codecs/simpletext/SimpleTextBKDReader.java       |  1 +
 .../codecs/simpletext/SimpleTextPointsWriter.java    |  1 +
 .../lucene/codecs/lucene86/Lucene86PointsWriter.java |  1 +
 .../java/org/apache/lucene/document/FieldType.java   |  1 +
 .../org/apache/lucene/document/RangeFieldQuery.java  |  1 +
 .../java/org/apache/lucene/document/ShapeField.java  |  1 +
 .../src/java/org/apache/lucene/geo/Tessellator.java  |  1 +
 .../java/org/apache/lucene/index/BaseTermsEnum.java  |  1 +
 .../lucene/index/FilterSortedNumericDocValues.java   |  7 +++++++
 .../lucene/index/FilterSortedSetDocValues.java       | 11 +++++++++++
 .../java/org/apache/lucene/index/FreqProxFields.java |  4 ++++
 .../java/org/apache/lucene/index/IndexWriter.java    |  2 ++
 .../index/SoftDeletesDirectoryReaderWrapper.java     |  1 +
 .../org/apache/lucene/search/CachingCollector.java   |  3 +++
 .../org/apache/lucene/search/DoubleValuesSource.java |  1 +
 .../java/org/apache/lucene/search/IndriScorer.java   |  1 +
 .../lucene/search/similarities/AxiomaticF1EXP.java   |  6 ++----
 .../lucene/search/similarities/AxiomaticF1LOG.java   |  6 ++----
 .../lucene/search/similarities/AxiomaticF2EXP.java   |  6 ++----
 .../lucene/search/similarities/AxiomaticF2LOG.java   |  6 ++----
 .../lucene/search/similarities/AxiomaticF3EXP.java   |  6 ++----
 .../lucene/search/similarities/AxiomaticF3LOG.java   |  5 ++---
 .../similarities/IndriDirichletSimilarity.java       |  1 +
 .../apache/lucene/search/similarities/LambdaTTF.java |  1 +
 .../apache/lucene/search/spans/SpanFirstQuery.java   |  4 ++--
 .../search/spans/SpanMultiTermQueryWrapper.java      |  1 +
 .../lucene/search/spans/SpanPositionQueue.java       |  1 +
 .../core/src/java/org/apache/lucene/store/Lock.java  |  1 +
 .../src/java/org/apache/lucene/util/FixedBitSet.java |  1 +
 .../java/org/apache/lucene/util/OfflineSorter.java   |  1 +
 .../org/apache/lucene/util/SparseFixedBitSet.java    |  2 ++
 .../org/apache/lucene/util/hnsw/BoundsChecker.java   |  4 ++++
 .../apache/lucene/util/packed/BlockPackedWriter.java |  1 +
 .../util/packed/MonotonicBlockPackedWriter.java      |  1 +
 .../lucene/document/BaseLatLonSpatialTestCase.java   |  6 ++++++
 .../apache/lucene/document/BaseXYShapeTestCase.java  |  6 ++++++
 .../org/apache/lucene/index/TestLogMergePolicy.java  |  1 +
 .../test/org/apache/lucene/index/TestNRTThreads.java |  1 +
 .../org/apache/lucene/index/TestNoMergePolicy.java   |  1 +
 .../test/org/apache/lucene/index/TestOrdinalMap.java |  1 +
 .../lucene/index/TestUpgradeIndexMergePolicy.java    |  1 +
 .../lucene/search/TestBoolean2ScorerSupplier.java    |  1 +
 .../search/TestBooleanQueryVisitSubscorers.java      |  1 +
 .../org/apache/lucene/search/TestIndexSearcher.java  | 13 +++++++++++++
 .../org/apache/lucene/search/TestLRUQueryCache.java  |  2 ++
 .../apache/lucene/search/TestMinShouldMatch2.java    |  1 +
 .../search/TestSimpleExplanationsWithFillerDocs.java |  2 ++
 .../org/apache/lucene/search/TestSubScorerFreqs.java |  1 +
 .../apache/lucene/store/TestFileSwitchDirectory.java |  1 +
 .../test/org/apache/lucene/store/TestMultiMMap.java  |  1 +
 .../test/org/apache/lucene/util/TestFixedBitSet.java |  1 +
 .../apache/lucene/util/hnsw/MockVectorValues.java    |  1 +
 .../writercache/UTF8TaxonomyWriterCache.java         |  1 +
 .../lucene/facet/TestParallelDrillSideways.java      |  4 ++++
 .../search/matchhighlight/CharSequenceIterator.java  |  9 +++++++++
 .../vectorhighlight/TestFastVectorHighlighter.java   |  1 +
 .../lucene/luke/app/desktop/PreferencesImpl.java     |  1 +
 .../app/desktop/components/TabbedPaneProvider.java   |  1 +
 .../lucene/luke/app/desktop/util/TabUtils.java       |  1 +
 .../lucene/luke/models/search/SimilarityConfig.java  |  1 +
 .../lucene/luke/models/tools/IndexToolsImpl.java     |  1 +
 .../util/twentynewsgroups/MessageFilesParser.java    |  1 +
 .../org/apache/lucene/misc/SweetSpotSimilarity.java  |  1 +
 .../apache/lucene/monitor/PresearcherTestBase.java   |  1 +
 .../function/valuesource/BytesRefFieldSource.java    |  1 +
 .../function/valuesource/MultiFloatFunction.java     |  1 +
 .../lucene/queryparser/classic/QueryParser.java      |  4 ++--
 .../standard/parser/StandardSyntaxParser.java        |  1 +
 .../flexible/standard/parser/StandardSyntaxParser.jj |  1 +
 .../apache/lucene/queryparser/xml/CoreParser.java    |  1 +
 .../apache/lucene/replicator/nrt/CopyOneFile.java    |  1 +
 .../apache/lucene/replicator/nrt/SimpleCopyJob.java  |  2 ++
 .../sandbox/document/FloatPointNearestNeighbor.java  |  1 +
 .../lucene/sandbox/search/NearestNeighbor.java       |  1 +
 .../lucene/sandbox/search/TermAutomatonQuery.java    |  1 +
 .../sandbox/search/TestPhraseWildcardQuery.java      |  6 ++++++
 .../lucene/spatial/prefix/tree/LegacyPrefixTree.java |  1 +
 .../spatial/prefix/tree/NumberRangePrefixTree.java   |  1 +
 .../lucene/spatial/prefix/TestDateNRStrategy.java    |  1 +
 .../spatial/prefix/TestHeatmapFacetCounter.java      |  1 +
 .../lucene/spatial/prefix/TestNumberRangeFacets.java |  1 +
 .../prefix/TestRandomSpatialOpFuzzyPrefixTree50.java |  1 +
 .../spatial/spatial4j/ShapeRectRelationTestCase.java |  5 +++++
 .../TestGeo3dShapeWGS84ModelRectRelation.java        |  3 +++
 .../java/org/apache/lucene/spatial3d/geom/Plane.java |  1 +
 .../org/apache/lucene/spatial3d/geom/XYZBounds.java  |  2 ++
 .../suggest/analyzing/AnalyzingInfixSuggester.java   |  1 +
 .../STUniformSplitRot13PostingsFormat.java           |  2 ++
 .../lucene/index/BaseIndexFileFormatTestCase.java    |  3 +++
 .../lucene/index/BasePointsFormatTestCase.java       |  6 ++++++
 .../java/org/apache/lucene/index/RandomCodec.java    |  1 +
 .../lucene/search/TestBaseExplanationTestCase.java   |  2 ++
 .../test/org/apache/lucene/util/WithNestedTests.java |  6 ++++--
 135 files changed, 250 insertions(+), 33 deletions(-)

diff --git a/gradle/generation/javacc.gradle b/gradle/generation/javacc.gradle
index c0c0e70..4b1e781 100644
--- a/gradle/generation/javacc.gradle
+++ b/gradle/generation/javacc.gradle
@@ -132,6 +132,12 @@ configure(project(":lucene:queryparser")) {
           text = text.replace(
               "public class QueryParser ",
               '@SuppressWarnings("unused") public class QueryParser ')
+          text = text.replace(
+              "final public Query TopLevelQuery(",
+              "@Override final public Query TopLevelQuery(")
+          text = text.replace(
+              "public void ReInit(CharStream ",
+              "@Override public void ReInit(CharStream ")
           return text
         })
       }
diff --git a/gradle/generation/snowball.patch b/gradle/generation/snowball.patch
index a369acb..bd92a1c 100644
--- a/gradle/generation/snowball.patch
+++ b/gradle/generation/snowball.patch
@@ -570,7 +570,7 @@ index 0000000..0cc2b60
 +	)
 +)
 diff --git a/compiler/generator_java.c b/compiler/generator_java.c
-index 2958452..966adb4 100644
+index 2958452..c254dbe 100644
 --- a/compiler/generator_java.c
 +++ b/compiler/generator_java.c
 @@ -272,7 +272,7 @@ static void generate_AE(struct generator * g, struct node * p) {
@@ -582,7 +582,21 @@ index 2958452..966adb4 100644
              break;
      }
  }
-@@ -1140,6 +1140,7 @@ static void generate_class_begin(struct generator * g) {
+@@ -941,9 +941,12 @@ static void generate_define(struct generator * g, struct node * p) {
+      * be required to allow the SnowballProgram base class to invoke them.
+      * FIXME: Is this avoidable?
+      */
+-    if (q->type == t_routine && !q->used_in_among) {
++    if (q->used_in_among) {
++        g->S[0] = "public";
++    } else if (q->type == t_routine) {
+         g->S[0] = "private";
+     } else {
++        w(g, "~N~M@Override");
+         g->S[0] = "public";
+     }
+     g->V[0] = q;
+@@ -1140,6 +1143,7 @@ static void generate_class_begin(struct generator * g) {
      w(g, " {~+~N"
           "~N"
           "~Mprivate static final long serialVersionUID = 1L;~N"
@@ -590,7 +604,7 @@ index 2958452..966adb4 100644
           "~N");
  }
  
-@@ -1186,7 +1187,7 @@ static void generate_among_table(struct generator * g, struct among * x) {
+@@ -1186,7 +1190,7 @@ static void generate_among_table(struct generator * g, struct among * x) {
              if (v->function != 0) {
                  w(g, ", \"");
                  write_varname(g, v->function);
diff --git a/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs b/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs
index a775421..b3ef87f 100644
--- a/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs
+++ b/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs
@@ -34,6 +34,7 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.source=11
diff --git a/gradle/validation/ecj-lint/ecj.javadocs.prefs b/gradle/validation/ecj-lint/ecj.javadocs.prefs
index b85d32a..cff4153 100644
--- a/gradle/validation/ecj-lint/ecj.javadocs.prefs
+++ b/gradle/validation/ecj-lint/ecj.javadocs.prefs
@@ -62,7 +62,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.java
index 5af716d..9ef7e15 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArabicStemmer.java
@@ -1066,6 +1066,7 @@ private boolean r_Suffix_All_alef_maqsura() {
   return true;
 }
 
+@Override
 public boolean stem() {
   B_is_noun = true;
   B_is_verb = true;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.java
index 60553c3..01eed62 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ArmenianStemmer.java
@@ -353,6 +353,7 @@ private boolean r_ending() {
   return true;
 }
 
+@Override
 public boolean stem() {
   r_mark_regions();
   limit_backward = cursor;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.java
index 6da8ed7..e03be92 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/BasqueStemmer.java
@@ -769,6 +769,7 @@ private boolean r_adjetiboak() {
   return true;
 }
 
+@Override
 public boolean stem() {
   r_mark_regions();
   limit_backward = cursor;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.java
index 4816b6a..de670a7 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/CatalanStemmer.java
@@ -850,6 +850,7 @@ private boolean r_residual_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   r_mark_regions();
   limit_backward = cursor;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java
index ce1ee3a..caf4f44 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java
@@ -263,6 +263,7 @@ private boolean r_undouble() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_mark_regions();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java
index b16151b..559301e 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java
@@ -595,6 +595,7 @@ private boolean r_standard_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_prelude();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java
index 892ec17..cb7f761 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java
@@ -865,6 +865,7 @@ private boolean r_postlude() {
   return true;
 }
 
+@Override
 public boolean stem() {
   lab0: {
     int v_1 = cursor;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.java
index a846de7..1d7aa6f 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EstonianStemmer.java
@@ -976,6 +976,7 @@ private boolean r_verb_exceptions() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_mark_regions();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
index 039d872..e44d614 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
@@ -685,6 +685,7 @@ private boolean r_tidy() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_mark_regions();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java
index 69f697f..7d7e828 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java
@@ -1060,6 +1060,7 @@ private boolean r_un_accent() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_prelude();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java
index 55f5dd6..7835feb 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java
@@ -528,6 +528,7 @@ private boolean r_standard_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_prelude();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java
index b296733..d7ad875 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java
@@ -499,6 +499,7 @@ private boolean r_standard_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_prelude();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.java
index 1381bbf..3dce777 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GreekStemmer.java
@@ -2412,6 +2412,7 @@ private boolean r_step7() {
   return true;
 }
 
+@Override
 public boolean stem() {
   limit_backward = cursor;
   cursor = limit;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HindiStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HindiStemmer.java
index 943773c..8caeb4b 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HindiStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HindiStemmer.java
@@ -164,6 +164,7 @@ public boolean r_CONSONANT() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   if (cursor >= limit)
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java
index b68abb7..50bafc2 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java
@@ -596,6 +596,7 @@ private boolean r_plur_owner() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_mark_regions();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IndonesianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IndonesianStemmer.java
index bb9dafa..620343f 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IndonesianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IndonesianStemmer.java
@@ -264,6 +264,7 @@ private boolean r_remove_second_order_prefix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   I_measure = 0;
   int v_1 = cursor;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.java
index 6aecba5..03d940b 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/IrishStemmer.java
@@ -365,6 +365,7 @@ private boolean r_verb_sfx() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_initial_morph();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java
index 6157a1f..79e2a00 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java
@@ -859,6 +859,7 @@ private boolean r_vowel_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_prelude();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java
index 003be80..7544bd3 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java
@@ -1346,6 +1346,7 @@ private boolean r_measure() {
   return true;
 }
 
+@Override
 public boolean stem() {
   B_Y_found = false;
   B_stemmed = false;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.java
index 48b5c3a..c3ab0de 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LithuanianStemmer.java
@@ -444,6 +444,7 @@ private boolean r_fix_gd() {
   return true;
 }
 
+@Override
 public boolean stem() {
   I_p1 = limit;
   int v_1 = cursor;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java
index c8412fe..8bf357f 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java
@@ -1503,6 +1503,7 @@ private boolean r_respell() {
   return true;
 }
 
+@Override
 public boolean stem() {
   limit_backward = cursor;
   cursor = limit;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.java
index a5baae1..d098db7 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NepaliStemmer.java
@@ -262,6 +262,7 @@ private boolean r_remove_category_3() {
   return true;
 }
 
+@Override
 public boolean stem() {
   limit_backward = cursor;
   cursor = limit;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java
index 228b63b..9935799 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java
@@ -228,6 +228,7 @@ private boolean r_other_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_mark_regions();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java
index d4e300f..cb1bb38 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java
@@ -464,6 +464,7 @@ private boolean r_Step_5b() {
   return true;
 }
 
+@Override
 public boolean stem() {
   B_Y_found = false;
   int v_1 = cursor;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java
index 18d02d3..c306d95 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java
@@ -767,6 +767,7 @@ private boolean r_residual_form() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_prelude();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java
index fb2020c..1c76eb7 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java
@@ -755,6 +755,7 @@ private boolean r_vowel_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_prelude();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java
index 9d42e8e..2beea98 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java
@@ -459,6 +459,7 @@ private boolean r_tidy_up() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   lab0: {
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.java
index 69daf14..42883a1 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SerbianStemmer.java
@@ -3658,6 +3658,7 @@ private boolean r_Step_3() {
   return true;
 }
 
+@Override
 public boolean stem() {
   r_cyr_to_lat();
   r_prelude();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
index 36635fa..08f58e2 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
@@ -842,6 +842,7 @@ private boolean r_residual_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   r_mark_regions();
   limit_backward = cursor;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
index 9d5cce5..3d1e565 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
@@ -229,6 +229,7 @@ private boolean r_other_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   int v_1 = cursor;
   r_mark_regions();
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.java
index 13fbb6c..144ef94 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TamilStemmer.java
@@ -1904,6 +1904,7 @@ private boolean r_remove_tense_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   B_found_vetrumai_urupu = false;
   int v_1 = cursor;
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
index 1ab45bb..4787530 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
@@ -2248,6 +2248,7 @@ private boolean r_postlude() {
   return true;
 }
 
+@Override
 public boolean stem() {
   if (!r_more_than_one_syllable_word())
   {
diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.java
index 6c50831..342862b 100644
--- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.java
+++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/YiddishStemmer.java
@@ -1353,6 +1353,7 @@ private boolean r_standard_suffix() {
   return true;
 }
 
+@Override
 public boolean stem() {
   r_prelude();
   int v_2 = cursor;
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/LegacyFieldsIndexReader.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/LegacyFieldsIndexReader.java
index 596ac82..b853816 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/LegacyFieldsIndexReader.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene50/compressing/LegacyFieldsIndexReader.java
@@ -162,6 +162,7 @@ final class LegacyFieldsIndexReader extends FieldsIndex {
     return hi;
   }
 
+  @Override
   long getStartPointer(int docID) {
     if (docID < 0 || docID >= maxDoc) {
       throw new IllegalArgumentException("docID out of range [0-" + maxDoc + "]: " + docID);
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesProducer.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesProducer.java
index a52989d..0d004bb 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesProducer.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesProducer.java
@@ -619,6 +619,7 @@ final class Lucene70DocValuesProducer extends DocValuesProducer {
           long blockEndOffset;
           LongValues values;
 
+          @Override
           public long get(long index) {
             final long block = index >>> shift;
             if (this.block != block) {
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/Lucene60PointsWriter.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/Lucene60PointsWriter.java
index 4dbfd38..90d44f3 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/Lucene60PointsWriter.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/Lucene60PointsWriter.java
@@ -133,6 +133,7 @@ public class Lucene60PointsWriter extends PointsWriter {
               throw new IllegalStateException();
             }
 
+            @Override
             public void visit(int docID, byte[] packedValue) throws IOException {
               writer.add(packedValue, docID);
             }
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java
index 1157cc2..db8c6db 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java
@@ -81,6 +81,7 @@ public class CachingNaiveBayesClassifier extends SimpleNaiveBayesClassifier {
   }
 
   /** Transforms values into a range between 0 and 1 */
+  @Override
   protected List<ClassificationResult<BytesRef>> assignClassNormalizedList(String inputDocument)
       throws IOException {
     String[] tokenizedText = tokenize(inputDocument);
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
index abe075d..a49c66b 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
@@ -477,6 +477,7 @@ public class FSTTermsReader extends FieldsProducer {
           this.fsaState = -1;
         }
 
+        @Override
         public String toString() {
           return "arc=" + fstArc + " state=" + fsaState;
         }
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java
index 6c74567..15427cd 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java
@@ -108,6 +108,7 @@ final class SimpleTextBKDReader extends PointValues implements Accountable {
     }
   }
 
+  @Override
   public void intersect(IntersectVisitor visitor) throws IOException {
     intersect(getIntersectState(visitor), 1, minPackedValue, maxPackedValue);
   }
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointsWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointsWriter.java
index 4dab17d..2061ec6 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointsWriter.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointsWriter.java
@@ -99,6 +99,7 @@ class SimpleTextPointsWriter extends PointsWriter {
               throw new IllegalStateException();
             }
 
+            @Override
             public void visit(int docID, byte[] packedValue) throws IOException {
               writer.add(packedValue, docID);
             }
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86PointsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86PointsWriter.java
index ba29bf8..e671d7a 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86PointsWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene86/Lucene86PointsWriter.java
@@ -155,6 +155,7 @@ public class Lucene86PointsWriter extends PointsWriter {
               throw new IllegalStateException();
             }
 
+            @Override
             public void visit(int docID, byte[] packedValue) throws IOException {
               writer.add(packedValue, docID);
             }
diff --git a/lucene/core/src/java/org/apache/lucene/document/FieldType.java b/lucene/core/src/java/org/apache/lucene/document/FieldType.java
index 9ffa198..0b24003 100644
--- a/lucene/core/src/java/org/apache/lucene/document/FieldType.java
+++ b/lucene/core/src/java/org/apache/lucene/document/FieldType.java
@@ -119,6 +119,7 @@ public class FieldType implements IndexableFieldType {
    *
    * @see #setTokenized(boolean)
    */
+  @Override
   public boolean tokenized() {
     return this.tokenized;
   }
diff --git a/lucene/core/src/java/org/apache/lucene/document/RangeFieldQuery.java b/lucene/core/src/java/org/apache/lucene/document/RangeFieldQuery.java
index 00fb6de..0d0edbb 100644
--- a/lucene/core/src/java/org/apache/lucene/document/RangeFieldQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/document/RangeFieldQuery.java
@@ -347,6 +347,7 @@ public abstract class RangeFieldQuery extends Query {
         return Relation.CELL_CROSSES_QUERY;
       }
 
+      @Override
       boolean matches(byte[] queryPackedValue, byte[] packedValue, int numDims, int bytesPerDim) {
         return INTERSECTS.matches(queryPackedValue, packedValue, numDims, bytesPerDim)
             && WITHIN.matches(queryPackedValue, packedValue, numDims, bytesPerDim) == false;
diff --git a/lucene/core/src/java/org/apache/lucene/document/ShapeField.java b/lucene/core/src/java/org/apache/lucene/document/ShapeField.java
index 8d74923..6a3edfe 100644
--- a/lucene/core/src/java/org/apache/lucene/document/ShapeField.java
+++ b/lucene/core/src/java/org/apache/lucene/document/ShapeField.java
@@ -457,6 +457,7 @@ public final class ShapeField {
     }
 
     /** pretty print the triangle vertices */
+    @Override
     public String toString() {
       String result =
           (aX + ", " + aY)
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 cd45056..5289169 100644
--- a/lucene/core/src/java/org/apache/lucene/geo/Tessellator.java
+++ b/lucene/core/src/java/org/apache/lucene/geo/Tessellator.java
@@ -1454,6 +1454,7 @@ public final class Tessellator {
     }
 
     /** pretty print the triangle vertices */
+    @Override
     public String toString() {
       String result =
           vertex[0].x
diff --git a/lucene/core/src/java/org/apache/lucene/index/BaseTermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/BaseTermsEnum.java
index 561557c..37b8395 100644
--- a/lucene/core/src/java/org/apache/lucene/index/BaseTermsEnum.java
+++ b/lucene/core/src/java/org/apache/lucene/index/BaseTermsEnum.java
@@ -65,6 +65,7 @@ public abstract class BaseTermsEnum extends TermsEnum {
     }
   }
 
+  @Override
   public AttributeSource attributes() {
     if (atts == null) {
       atts = new AttributeSource();
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterSortedNumericDocValues.java b/lucene/core/src/java/org/apache/lucene/index/FilterSortedNumericDocValues.java
index 22aeb39..7d2c7f1 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterSortedNumericDocValues.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterSortedNumericDocValues.java
@@ -31,30 +31,37 @@ public abstract class FilterSortedNumericDocValues extends SortedNumericDocValue
     this.in = in;
   }
 
+  @Override
   public boolean advanceExact(int target) throws IOException {
     return in.advanceExact(target);
   }
 
+  @Override
   public long nextValue() throws IOException {
     return in.nextValue();
   }
 
+  @Override
   public int docValueCount() {
     return in.docValueCount();
   }
 
+  @Override
   public int docID() {
     return in.docID();
   }
 
+  @Override
   public int nextDoc() throws IOException {
     return in.nextDoc();
   }
 
+  @Override
   public int advance(int target) throws IOException {
     return in.advance(target);
   }
 
+  @Override
   public long cost() {
     return in.cost();
   }
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java b/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java
index 66309e6..9a3706f 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterSortedSetDocValues.java
@@ -33,46 +33,57 @@ public class FilterSortedSetDocValues extends SortedSetDocValues {
     this.in = in;
   }
 
+  @Override
   public boolean advanceExact(int target) throws IOException {
     return in.advanceExact(target);
   }
 
+  @Override
   public long nextOrd() throws IOException {
     return in.nextOrd();
   }
 
+  @Override
   public BytesRef lookupOrd(long ord) throws IOException {
     return in.lookupOrd(ord);
   }
 
+  @Override
   public long getValueCount() {
     return in.getValueCount();
   }
 
+  @Override
   public long lookupTerm(BytesRef key) throws IOException {
     return in.lookupTerm(key);
   }
 
+  @Override
   public TermsEnum termsEnum() throws IOException {
     return in.termsEnum();
   }
 
+  @Override
   public TermsEnum intersect(CompiledAutomaton automaton) throws IOException {
     return in.intersect(automaton);
   }
 
+  @Override
   public int docID() {
     return in.docID();
   }
 
+  @Override
   public int nextDoc() throws IOException {
     return in.nextDoc();
   }
 
+  @Override
   public int advance(int target) throws IOException {
     return in.advance(target);
   }
 
+  @Override
   public long cost() {
     return in.cost();
   }
diff --git a/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java b/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java
index 9a45561..d57836e 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java
@@ -40,6 +40,7 @@ class FreqProxFields extends Fields {
     }
   }
 
+  @Override
   public Iterator<String> iterator() {
     return fields.keySet().iterator();
   }
@@ -137,6 +138,7 @@ class FreqProxFields extends Fields {
       ord = -1;
     }
 
+    @Override
     public SeekStatus seekCeil(BytesRef text) {
       // TODO: we could instead keep the BytesRefHash
       // intact so this is a hash lookup
@@ -173,6 +175,7 @@ class FreqProxFields extends Fields {
       }
     }
 
+    @Override
     public void seekExact(long ord) {
       this.ord = (int) ord;
       int textStart = postingsArray.textStarts[sortedTermIDs[this.ord]];
@@ -281,6 +284,7 @@ class FreqProxFields extends Fields {
      * @see TermState
      * @see #seekExact(BytesRef, TermState)
      */
+    @Override
     public TermState termState() throws IOException {
       return new TermState() {
         @Override
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
index 3f1907f..9c3351c 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
@@ -2368,6 +2368,7 @@ public class IndexWriter
    *
    * <p>The Set is unmodifiable.
    */
+  @Override
   public synchronized Set<SegmentCommitInfo> getMergingSegments() {
     return Collections.unmodifiableSet(mergingSegments);
   }
@@ -6271,6 +6272,7 @@ public class IndexWriter
       writer.merge(merge);
     }
 
+    @Override
     public String toString() {
       return writer.segString();
     }
diff --git a/lucene/core/src/java/org/apache/lucene/index/SoftDeletesDirectoryReaderWrapper.java b/lucene/core/src/java/org/apache/lucene/index/SoftDeletesDirectoryReaderWrapper.java
index e47303c..fbf5171 100644
--- a/lucene/core/src/java/org/apache/lucene/index/SoftDeletesDirectoryReaderWrapper.java
+++ b/lucene/core/src/java/org/apache/lucene/index/SoftDeletesDirectoryReaderWrapper.java
@@ -97,6 +97,7 @@ public final class SoftDeletesDirectoryReaderWrapper extends FilterDirectoryRead
       this.field = field;
     }
 
+    @Override
     protected LeafReader[] wrap(List<? extends LeafReader> readers) {
       List<LeafReader> wrapped = new ArrayList<>(readers.size());
       for (LeafReader reader : readers) {
diff --git a/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java b/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
index 898cf73..d065efd 100644
--- a/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
+++ b/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
@@ -83,6 +83,7 @@ public abstract class CachingCollector extends FilterCollector {
     // doesn't mean the
     //   wrapped collector doesn't need it to do its job.
 
+    @Override
     public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
       postCollection();
       final LeafCollector in = this.in.getLeafCollector(context);
@@ -126,6 +127,7 @@ public abstract class CachingCollector extends FilterCollector {
       }
     }
 
+    @Override
     public void replay(Collector other) throws IOException {
       postCollection();
       if (!isCached()) {
@@ -150,6 +152,7 @@ public abstract class CachingCollector extends FilterCollector {
       scores = new ArrayList<>();
     }
 
+    @Override
     protected NoScoreCachingLeafCollector wrap(LeafCollector in, int maxDocsToCache) {
       return new ScoreCachingLeafCollector(in, maxDocsToCache);
     }
diff --git a/lucene/core/src/java/org/apache/lucene/search/DoubleValuesSource.java b/lucene/core/src/java/org/apache/lucene/search/DoubleValuesSource.java
index f5e4222..a665ecc 100644
--- a/lucene/core/src/java/org/apache/lucene/search/DoubleValuesSource.java
+++ b/lucene/core/src/java/org/apache/lucene/search/DoubleValuesSource.java
@@ -404,6 +404,7 @@ public abstract class DoubleValuesSource implements SegmentCacheable {
       else return Explanation.noMatch(this.toString());
     }
 
+    @Override
     public DoubleValuesSource rewrite(IndexSearcher searcher) throws IOException {
       return this;
     }
diff --git a/lucene/core/src/java/org/apache/lucene/search/IndriScorer.java b/lucene/core/src/java/org/apache/lucene/search/IndriScorer.java
index d152530..7d7902d 100644
--- a/lucene/core/src/java/org/apache/lucene/search/IndriScorer.java
+++ b/lucene/core/src/java/org/apache/lucene/search/IndriScorer.java
@@ -40,6 +40,7 @@ public abstract class IndriScorer extends Scorer {
   @Override
   public abstract float score() throws IOException;
 
+  @Override
   public abstract float smoothingScore(int docId) throws IOException;
 
   @Override
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF1EXP.java b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF1EXP.java
index 2a3f51b..7bdcad9 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF1EXP.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF1EXP.java
@@ -92,7 +92,6 @@ public class AxiomaticF1EXP 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) {
@@ -104,15 +103,15 @@ public class AxiomaticF1EXP extends Axiomatic {
             "avgdl, average length of field across all documents"),
         Explanation.match((float) docLen, "dl, length of field"));
   }
-  ;
 
+  @Override
   protected Explanation tflnExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) tfln(stats, freq, docLen),
         "tfln, mixed term frequency and document length, equals to 1");
   }
-  ;
 
+  @Override
   protected Explanation idfExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) idf(stats, freq, docLen),
@@ -121,5 +120,4 @@ public class AxiomaticF1EXP extends Axiomatic {
             (float) stats.getNumberOfDocuments(), "N, total number of documents with field"),
         Explanation.match((float) stats.getDocFreq(), "n, number of documents containing term"));
   }
-  ;
 }
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF1LOG.java b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF1LOG.java
index c3f44b9..7d24f7f 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF1LOG.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF1LOG.java
@@ -83,7 +83,6 @@ public class AxiomaticF1LOG 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) {
@@ -95,15 +94,15 @@ public class AxiomaticF1LOG extends Axiomatic {
             "avgdl, average length of field across all documents"),
         Explanation.match((float) docLen, "dl, length of field"));
   }
-  ;
 
+  @Override
   protected Explanation tflnExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) tfln(stats, freq, docLen),
         "tfln, mixed term frequency and document length, equals to 1");
   }
-  ;
 
+  @Override
   protected Explanation idfExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) idf(stats, freq, docLen),
@@ -112,5 +111,4 @@ public class AxiomaticF1LOG extends Axiomatic {
             (float) stats.getNumberOfDocuments(), "N, total number of documents with field"),
         Explanation.match((float) stats.getDocFreq(), "n, number of documents containing term"));
   }
-  ;
 }
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF2EXP.java b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF2EXP.java
index 04c2a31..2fbd580 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF2EXP.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF2EXP.java
@@ -88,14 +88,13 @@ public class AxiomaticF2EXP extends Axiomatic {
   protected Explanation tfExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match((float) tf(stats, freq, docLen), "tf, term frequency, equals to 1");
   }
-  ;
 
   @Override
   protected Explanation lnExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match((float) ln(stats, freq, docLen), "ln, document length, equals to 1");
   }
-  ;
 
+  @Override
   protected Explanation tflnExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) tfln(stats, freq, docLen),
@@ -107,8 +106,8 @@ public class AxiomaticF2EXP extends Axiomatic {
             (float) stats.getAvgFieldLength(),
             "avgdl, average length of field across all documents"));
   }
-  ;
 
+  @Override
   protected Explanation idfExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) idf(stats, freq, docLen),
@@ -117,5 +116,4 @@ public class AxiomaticF2EXP extends Axiomatic {
             (float) stats.getNumberOfDocuments(), "N, total number of documents with field"),
         Explanation.match((float) stats.getDocFreq(), "n, number of documents containing term"));
   }
-  ;
 }
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF2LOG.java b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF2LOG.java
index 14427d9..24864d6 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF2LOG.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF2LOG.java
@@ -78,14 +78,13 @@ public class AxiomaticF2LOG extends Axiomatic {
   protected Explanation tfExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match((float) tf(stats, freq, docLen), "tf, term frequency, equals to 1");
   }
-  ;
 
   @Override
   protected Explanation lnExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match((float) ln(stats, freq, docLen), "ln, document length, equals to 1");
   }
-  ;
 
+  @Override
   protected Explanation tflnExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) tfln(stats, freq, docLen),
@@ -97,8 +96,8 @@ public class AxiomaticF2LOG extends Axiomatic {
             (float) stats.getAvgFieldLength(),
             "avgdl, average length of field across all documents"));
   }
-  ;
 
+  @Override
   protected Explanation idfExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) idf(stats, freq, docLen),
@@ -107,5 +106,4 @@ public class AxiomaticF2LOG extends Axiomatic {
             (float) stats.getNumberOfDocuments(), "N, total number of documents with field"),
         Explanation.match((float) stats.getDocFreq(), "n, number of documents containing term"));
   }
-  ;
 }
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF3EXP.java b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF3EXP.java
index 3deaa7a..23f3806 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF3EXP.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/AxiomaticF3EXP.java
@@ -92,21 +92,20 @@ public class AxiomaticF3EXP 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) {
     return Explanation.match((float) ln(stats, freq, docLen), "ln, document length, equals to 1");
   }
-  ;
 
+  @Override
   protected Explanation tflnExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) tfln(stats, freq, docLen),
         "tfln, mixed term frequency and document length, equals to 1");
   }
-  ;
 
+  @Override
   protected Explanation idfExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) idf(stats, freq, docLen),
@@ -115,5 +114,4 @@ public class AxiomaticF3EXP extends Axiomatic {
             (float) stats.getNumberOfDocuments(), "N, total number of documents with field"),
         Explanation.match((float) stats.getDocFreq(), "n, number of documents containing term"));
   }
-  ;
 }
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 9c2350f..e062274 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
@@ -87,15 +87,15 @@ public class AxiomaticF3LOG extends Axiomatic {
   protected Explanation lnExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match((float) ln(stats, freq, docLen), "ln, document length, equals to 1");
   }
-  ;
 
+  @Override
   protected Explanation tflnExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) tfln(stats, freq, docLen),
         "tfln, mixed term frequency and document length, equals to 1");
   }
-  ;
 
+  @Override
   protected Explanation idfExplain(BasicStats stats, double freq, double docLen) {
     return Explanation.match(
         (float) idf(stats, freq, docLen),
@@ -104,5 +104,4 @@ public class AxiomaticF3LOG extends Axiomatic {
             (float) stats.getNumberOfDocuments(), "N, total number of documents with field"),
         Explanation.match((float) stats.getDocFreq(), "n, number of documents containing term"));
   }
-  ;
 }
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/IndriDirichletSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/IndriDirichletSimilarity.java
index e494bc9..9f70836 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/IndriDirichletSimilarity.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/IndriDirichletSimilarity.java
@@ -86,6 +86,7 @@ public class IndriDirichletSimilarity extends LMSimilarity {
     return mu;
   }
 
+  @Override
   public String getName() {
     return String.format(Locale.ROOT, "IndriDirichlet(%f)", getMu());
   }
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaTTF.java b/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaTTF.java
index 084fe84..ace7f43 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaTTF.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaTTF.java
@@ -39,6 +39,7 @@ public class LambdaTTF extends Lambda {
     return lambda;
   }
 
+  @Override
   public final Explanation explain(BasicStats stats) {
     return Explanation.match(
         lambda(stats),
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java
index acde081..322aee6 100644
--- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java
@@ -16,7 +16,6 @@
  */
 package org.apache.lucene.search.spans;
 
-import java.io.IOException;
 import org.apache.lucene.search.spans.FilterSpans.AcceptStatus;
 
 /**
@@ -35,7 +34,8 @@ public class SpanFirstQuery extends SpanPositionRangeQuery {
     super(match, 0, end);
   }
 
-  protected AcceptStatus acceptPosition(Spans spans) throws IOException {
+  @Override
+  protected AcceptStatus acceptPosition(Spans spans) {
     assert spans.startPosition() != spans.endPosition()
         : "start equals end: " + spans.startPosition();
     if (spans.startPosition() >= end) return AcceptStatus.NO_MORE_IN_CURRENT_DOC;
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
index 3fa7ca2..4b1fc89 100644
--- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
+++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
@@ -159,6 +159,7 @@ public class SpanMultiTermQueryWrapper<Q extends MultiTermQuery> extends SpanQue
                 return new ArrayList<SpanQuery>();
               }
 
+              @Override
               protected Query build(List<SpanQuery> builder) {
                 return new SpanOrQuery(builder.toArray(new SpanQuery[builder.size()]));
               }
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionQueue.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionQueue.java
index 385d5b7..e2d0fa1 100644
--- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionQueue.java
+++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionQueue.java
@@ -23,6 +23,7 @@ class SpanPositionQueue extends PriorityQueue<Spans> {
     super(maxSize); // do not prepopulate
   }
 
+  @Override
   protected boolean lessThan(Spans s1, Spans s2) {
     int start1 = s1.startPosition();
     int start2 = s2.startPosition();
diff --git a/lucene/core/src/java/org/apache/lucene/store/Lock.java b/lucene/core/src/java/org/apache/lucene/store/Lock.java
index 7e6df4c..cdacdb5 100644
--- a/lucene/core/src/java/org/apache/lucene/store/Lock.java
+++ b/lucene/core/src/java/org/apache/lucene/store/Lock.java
@@ -47,6 +47,7 @@ public abstract class Lock implements Closeable {
    * @throws LockReleaseFailedException optional specific exception) if the lock could not be
    *     properly released.
    */
+  @Override
   public abstract void close() throws IOException;
 
   /**
diff --git a/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java b/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java
index 707ee76..913014d 100644
--- a/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java
+++ b/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java
@@ -186,6 +186,7 @@ public final class FixedBitSet extends BitSet {
     return (bits[i] & bitmask) != 0;
   }
 
+  @Override
   public void set(int index) {
     assert index >= 0 && index < numBits : "index=" + index + ", numBits=" + numBits;
     int wordNum = index >> 6; // div 64
diff --git a/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java b/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java
index 049d5af..e479f11 100644
--- a/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java
+++ b/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java
@@ -579,6 +579,7 @@ public class OfflineSorter {
      *     sequence. Returns <code>true</code> otherwise.
      * @throws EOFException if the file ends before the full sequence is read.
      */
+    @Override
     public BytesRef next() throws IOException {
       if (in.getFilePointer() >= end) {
         return null;
diff --git a/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java b/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java
index 2a1762a..1155800 100644
--- a/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java
+++ b/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java
@@ -138,6 +138,7 @@ public class SparseFixedBitSet extends BitSet {
   }
 
   /** Set the bit at index <code>i</code>. */
+  @Override
   public void set(int i) {
     assert consistent(i);
     final int i4096 = i >>> 12;
@@ -193,6 +194,7 @@ public class SparseFixedBitSet extends BitSet {
   }
 
   /** Clear the bit at index <code>i</code>. */
+  @Override
   public void clear(int i) {
     assert consistent(i);
     final int i4096 = i >>> 12;
diff --git a/lucene/core/src/java/org/apache/lucene/util/hnsw/BoundsChecker.java b/lucene/core/src/java/org/apache/lucene/util/hnsw/BoundsChecker.java
index 0a2d78b..ce15204 100644
--- a/lucene/core/src/java/org/apache/lucene/util/hnsw/BoundsChecker.java
+++ b/lucene/core/src/java/org/apache/lucene/util/hnsw/BoundsChecker.java
@@ -45,12 +45,14 @@ abstract class BoundsChecker {
       bound = Float.NEGATIVE_INFINITY;
     }
 
+    @Override
     void update(float sample) {
       if (sample > bound) {
         bound = sample;
       }
     }
 
+    @Override
     boolean check(float sample) {
       return sample < bound;
     }
@@ -62,12 +64,14 @@ abstract class BoundsChecker {
       bound = Float.POSITIVE_INFINITY;
     }
 
+    @Override
     void update(float sample) {
       if (sample < bound) {
         bound = sample;
       }
     }
 
+    @Override
     boolean check(float sample) {
       return sample > bound;
     }
diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedWriter.java
index 282a660..03239f4 100644
--- a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedWriter.java
@@ -64,6 +64,7 @@ public final class BlockPackedWriter extends AbstractBlockPackedWriter {
     super(out, blockSize);
   }
 
+  @Override
   protected void flush() throws IOException {
     assert off > 0;
     long min = Long.MAX_VALUE, max = Long.MIN_VALUE;
diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedWriter.java
index 026fd97..eca15ad 100644
--- a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedWriter.java
@@ -67,6 +67,7 @@ public final class MonotonicBlockPackedWriter extends AbstractBlockPackedWriter
     super.add(l);
   }
 
+  @Override
   protected void flush() throws IOException {
     assert off > 0;
 
diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java
index 518c9be..0d9f009 100644
--- a/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java
+++ b/lucene/core/src/test/org/apache/lucene/document/BaseLatLonSpatialTestCase.java
@@ -44,8 +44,10 @@ import org.apache.lucene.util.TestUtil;
 /** Base test case for testing geospatial indexing and search functionality * */
 public abstract class BaseLatLonSpatialTestCase extends BaseSpatialTestCase {
 
+  @Override
   protected abstract ShapeType getShapeType();
 
+  @Override
   protected Object nextShape() {
     return getShapeType().nextShape();
   }
@@ -181,16 +183,19 @@ public abstract class BaseLatLonSpatialTestCase extends BaseSpatialTestCase {
   /** internal shape type for testing different shape types */
   protected enum ShapeType {
     POINT() {
+      @Override
       public Point nextShape() {
         return GeoTestUtil.nextPoint();
       }
     },
     LINE() {
+      @Override
       public Line nextShape() {
         return GeoTestUtil.nextLine();
       }
     },
     POLYGON() {
+      @Override
       public Polygon nextShape() {
         while (true) {
           Polygon p = GeoTestUtil.nextPolygon();
@@ -204,6 +209,7 @@ public abstract class BaseLatLonSpatialTestCase extends BaseSpatialTestCase {
       }
     },
     MIXED() {
+      @Override
       public Object nextShape() {
         return RandomPicks.randomFrom(random(), subList).nextShape();
       }
diff --git a/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java b/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java
index 410c836..fcc73ec 100644
--- a/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java
+++ b/lucene/core/src/test/org/apache/lucene/document/BaseXYShapeTestCase.java
@@ -37,8 +37,10 @@ import org.apache.lucene.util.TestUtil;
 
 /** Base test case for testing indexing and search functionality of cartesian geometry * */
 public abstract class BaseXYShapeTestCase extends BaseSpatialTestCase {
+  @Override
   protected abstract ShapeType getShapeType();
 
+  @Override
   protected Object nextShape() {
     return getShapeType().nextShape();
   }
@@ -207,16 +209,19 @@ public abstract class BaseXYShapeTestCase extends BaseSpatialTestCase {
   /** internal shape type for testing different shape types */
   protected enum ShapeType {
     POINT() {
+      @Override
       public XYPoint nextShape() {
         return ShapeTestUtil.nextPoint();
       }
     },
     LINE() {
+      @Override
       public XYLine nextShape() {
         return ShapeTestUtil.nextLine();
       }
     },
     POLYGON() {
+      @Override
       public XYPolygon nextShape() {
         while (true) {
           XYPolygon p = ShapeTestUtil.nextPolygon();
@@ -230,6 +235,7 @@ public abstract class BaseXYShapeTestCase extends BaseSpatialTestCase {
       }
     },
     MIXED() {
+      @Override
       public Object nextShape() {
         return RandomPicks.randomFrom(random(), subList).nextShape();
       }
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java
index 2208cb0..7dbf49d 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java
@@ -22,6 +22,7 @@ import org.apache.lucene.index.MergePolicy.OneMerge;
 
 public class TestLogMergePolicy extends BaseMergePolicyTestCase {
 
+  @Override
   public MergePolicy mergePolicy() {
     return newLogMergePolicy(random());
   }
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java
index 22f7027..d54728f 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java
@@ -34,6 +34,7 @@ public class TestNRTThreads extends ThreadedIndexingAndSearchingTestCase {
   private boolean useNonNrtReaders = true;
 
   @Before
+  @Override
   public void setUp() throws Exception {
     super.setUp();
     useNonNrtReaders = random().nextBoolean();
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java
index f7569ab..81b1a61 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java
@@ -26,6 +26,7 @@ import org.junit.Test;
 
 public class TestNoMergePolicy extends BaseMergePolicyTestCase {
 
+  @Override
   public MergePolicy mergePolicy() {
     return NoMergePolicy.INSTANCE;
   }
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java
index 654bedc..f64ffa5 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java
@@ -45,6 +45,7 @@ public class TestOrdinalMap extends LuceneTestCase {
   private static final RamUsageTester.Accumulator ORDINAL_MAP_ACCUMULATOR =
       new RamUsageTester.Accumulator() {
 
+        @Override
         public long accumulateObject(
             Object o,
             long shallowSize,
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java
index 1cdd06b..c7531aa 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java
@@ -22,6 +22,7 @@ import org.apache.lucene.util.TestUtil;
 
 public class TestUpgradeIndexMergePolicy extends BaseMergePolicyTestCase {
 
+  @Override
   public MergePolicy mergePolicy() {
     MergePolicy in = newMergePolicy(random());
     if (in instanceof TieredMergePolicy) {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2ScorerSupplier.java b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2ScorerSupplier.java
index 5c672c3..2dc968f 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2ScorerSupplier.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2ScorerSupplier.java
@@ -76,6 +76,7 @@ public class TestBoolean2ScorerSupplier extends LuceneTestCase {
       return 1;
     }
 
+    @Override
     public DocIdSetIterator iterator() {
       return it;
     }
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
index 4710075..71e06f0 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
@@ -145,6 +145,7 @@ public class TestBooleanQueryVisitSubscorers extends LuceneTestCase {
       super(TopScoreDocCollector.create(10, Integer.MAX_VALUE));
     }
 
+    @Override
     public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
       final int docBase = context.docBase;
       return new FilterLeafCollector(super.getLeafCollector(context)) {
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
index 6d5cf8e..a627f3b 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
@@ -310,59 +310,72 @@ public class TestIndexSearcher extends LuceneTestCase {
 
   private static class RejectingMockExecutor implements ExecutorService {
 
+    @Override
     public void shutdown() {}
 
+    @Override
     public List<Runnable> shutdownNow() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isShutdown() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean isTerminated() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean awaitTermination(final long l, final TimeUnit timeUnit)
         throws InterruptedException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T> Future<T> submit(final Callable<T> tCallable) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T> Future<T> submit(final Runnable runnable, final T t) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public Future<?> submit(final Runnable runnable) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T> List<Future<T>> invokeAll(final Collection<? extends Callable<T>> callables)
         throws InterruptedException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T> List<Future<T>> invokeAll(
         final Collection<? extends Callable<T>> callables, final long l, final TimeUnit timeUnit)
         throws InterruptedException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T> T invokeAny(final Collection<? extends Callable<T>> callables)
         throws InterruptedException, ExecutionException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public <T> T invokeAny(
         final Collection<? extends Callable<T>> callables, final long l, final TimeUnit timeUnit)
         throws InterruptedException, ExecutionException, TimeoutException {
       throw new UnsupportedOperationException();
     }
 
+    @Override
     public void execute(final Runnable runnable) {
       throw new RejectedExecutionException();
     }
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
index 5d552ca..613be23 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
@@ -121,6 +121,7 @@ public class TestLRUQueryCache extends LuceneTestCase {
     Thread[] threads = new Thread[3];
     threads[0] =
         new Thread() {
+          @Override
           public void run() {
             Document doc = new Document();
             StringField f = new StringField("color", "", Store.NO);
@@ -169,6 +170,7 @@ public class TestLRUQueryCache extends LuceneTestCase {
                     searcher.search(
                         q,
                         new FilterCollector(collector2) {
+                          @Override
                           public ScoreMode scoreMode() {
                             return ScoreMode.COMPLETE; // will not use the cache because of scores
                           }
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java
index 95f64e0..45a8e80 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java
@@ -386,6 +386,7 @@ public class TestMinShouldMatch2 extends LuceneTestCase {
       return Float.POSITIVE_INFINITY;
     }
 
+    @Override
     public int docID() {
       return currentDoc;
     }
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java
index 1bc27b4..4b98ea7 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsWithFillerDocs.java
@@ -119,11 +119,13 @@ public class TestSimpleExplanationsWithFillerDocs extends TestSimpleExplanations
     super.qtest(q, expDocNrs);
   }
 
+  @Override
   public void testMA1() throws Exception {
     Assume.assumeNotNull("test is not viable with empty filler docs", EXTRA);
     super.testMA1();
   }
 
+  @Override
   public void testMA2() throws Exception {
     Assume.assumeNotNull("test is not viable with empty filler docs", EXTRA);
     super.testMA2();
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
index e6b8f5f..5b2ce4e 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
@@ -102,6 +102,7 @@ public class TestSubScorerFreqs extends LuceneTestCase {
       subScorers.put(((Scorer) scorer).getWeight().getQuery(), scorer);
     }
 
+    @Override
     public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
       final int docBase = context.docBase;
       return new FilterLeafCollector(super.getLeafCollector(context)) {
diff --git a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
index d447976..0ff95b4 100644
--- a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
+++ b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
@@ -107,6 +107,7 @@ public class TestFileSwitchDirectory extends BaseDirectoryTestCase {
   }
 
   // LUCENE-3380 -- make sure we get exception if the directory really does not exist.
+  @Override
   public void testNoDir() throws Throwable {
     Path primDir = createTempDir("foo");
     Path secondDir = createTempDir("bar");
diff --git a/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java b/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
index e34cf78..333c147 100644
--- a/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
+++ b/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
@@ -285,6 +285,7 @@ public class TestMultiMMap extends BaseDirectoryTestCase {
     }
   }
 
+  @Override
   public void testSliceOfSlice() throws Exception {
     int upto = TEST_NIGHTLY ? 10 : 8;
     for (int i = 0; i < upto; i++) {
diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java
index 181dd50..0c38847 100644
--- a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java
+++ b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java
@@ -334,6 +334,7 @@ public class TestFixedBitSet extends BaseBitSetTestCase<FixedBitSet> {
     doPrevSetBit(bs, obs);
   }
 
+  @Override
   public void testPrevSetBit() {
     checkPrevSetBitArray(new int[] {}, 0);
     checkPrevSetBitArray(new int[] {0}, 1);
diff --git a/lucene/core/src/test/org/apache/lucene/util/hnsw/MockVectorValues.java b/lucene/core/src/test/org/apache/lucene/util/hnsw/MockVectorValues.java
index 00cffde..d6cb7ab 100644
--- a/lucene/core/src/test/org/apache/lucene/util/hnsw/MockVectorValues.java
+++ b/lucene/core/src/test/org/apache/lucene/util/hnsw/MockVectorValues.java
@@ -124,6 +124,7 @@ class MockVectorValues extends VectorValues
     return advance(pos + 1);
   }
 
+  @Override
   public int advance(int target) {
     while (++pos < values.length) {
       if (seek(pos)) {
diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/UTF8TaxonomyWriterCache.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/UTF8TaxonomyWriterCache.java
index 09c5d98..6c95d09 100644
--- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/UTF8TaxonomyWriterCache.java
+++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/UTF8TaxonomyWriterCache.java
@@ -142,6 +142,7 @@ public final class UTF8TaxonomyWriterCache implements TaxonomyWriterCache, Accou
   }
 
   /** How many labels are currently stored in the cache. */
+  @Override
   public int size() {
     return count;
   }
diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestParallelDrillSideways.java b/lucene/facet/src/test/org/apache/lucene/facet/TestParallelDrillSideways.java
index 25d931f..3a2ac65 100644
--- a/lucene/facet/src/test/org/apache/lucene/facet/TestParallelDrillSideways.java
+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestParallelDrillSideways.java
@@ -43,16 +43,19 @@ public class TestParallelDrillSideways extends TestDrillSideways {
     executor = null;
   }
 
+  @Override
   protected DrillSideways getNewDrillSideways(
       IndexSearcher searcher, FacetsConfig config, SortedSetDocValuesReaderState state) {
     return new DrillSideways(searcher, config, null, state, executor);
   }
 
+  @Override
   protected DrillSideways getNewDrillSideways(
       IndexSearcher searcher, FacetsConfig config, TaxonomyReader taxoReader) {
     return new DrillSideways(searcher, config, taxoReader, null, executor);
   }
 
+  @Override
   protected DrillSideways getNewDrillSidewaysScoreSubdocsAtOnce(
       IndexSearcher searcher, FacetsConfig config, TaxonomyReader taxoReader) {
     return new DrillSideways(searcher, config, taxoReader, null, executor) {
@@ -63,6 +66,7 @@ public class TestParallelDrillSideways extends TestDrillSideways {
     };
   }
 
+  @Override
   protected DrillSideways getNewDrillSidewaysBuildFacetsResult(
       IndexSearcher searcher, FacetsConfig config, TaxonomyReader taxoReader) {
     return new DrillSideways(searcher, config, taxoReader, null, executor) {
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/CharSequenceIterator.java b/lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/CharSequenceIterator.java
index 40cb8cba..1826dce 100644
--- a/lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/CharSequenceIterator.java
+++ b/lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/CharSequenceIterator.java
@@ -32,11 +32,13 @@ final class CharSequenceIterator implements CharacterIterator {
     this.end = text.length();
   }
 
+  @Override
   public char first() {
     pos = begin;
     return current();
   }
 
+  @Override
   public char last() {
     if (end != begin) {
       pos = end - 1;
@@ -46,12 +48,14 @@ final class CharSequenceIterator implements CharacterIterator {
     return current();
   }
 
+  @Override
   public char setIndex(int p) {
     if (p < begin || p > end) throw new IllegalArgumentException("Invalid index");
     pos = p;
     return current();
   }
 
+  @Override
   public char current() {
     if (pos >= begin && pos < end) {
       return text.charAt(pos);
@@ -60,6 +64,7 @@ final class CharSequenceIterator implements CharacterIterator {
     }
   }
 
+  @Override
   public char next() {
     if (pos < end - 1) {
       pos++;
@@ -70,6 +75,7 @@ final class CharSequenceIterator implements CharacterIterator {
     }
   }
 
+  @Override
   public char previous() {
     if (pos > begin) {
       pos--;
@@ -79,14 +85,17 @@ final class CharSequenceIterator implements CharacterIterator {
     }
   }
 
+  @Override
   public int getBeginIndex() {
     return begin;
   }
 
+  @Override
   public int getEndIndex() {
     return end;
   }
 
+  @Override
   public int getIndex() {
     return pos;
   }
diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java
index ed29be2..451bdc3 100644
--- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java
+++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/TestFastVectorHighlighter.java
@@ -901,6 +901,7 @@ public class TestFastVectorHighlighter extends LuceneTestCase {
         fieldAnalyzers.get("field")); // This is required even though we provide a token stream
     Analyzer analyzer =
         new DelegatingAnalyzerWrapper(Analyzer.PER_FIELD_REUSE_STRATEGY) {
+          @Override
           public Analyzer getWrappedAnalyzer(String fieldName) {
             return fieldAnalyzers.get(fieldName);
           }
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/PreferencesImpl.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/PreferencesImpl.java
index 47d6331..4f94c7b 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/PreferencesImpl.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/PreferencesImpl.java
@@ -62,6 +62,7 @@ public final class PreferencesImpl implements Preferences {
     }
   }
 
+  @Override
   public List<String> getHistory() {
     return history;
   }
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/TabbedPaneProvider.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/TabbedPaneProvider.java
index 1bf5d11..a64d89e 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/TabbedPaneProvider.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/TabbedPaneProvider.java
@@ -79,6 +79,7 @@ public final class TabbedPaneProvider implements TabSwitcherProxy.TabSwitcher {
     return tabbedPane;
   }
 
+  @Override
   public void switchTab(Tab tab) {
     tabbedPane.setSelectedIndex(tab.index());
     tabbedPane.setVisible(false);
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TabUtils.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TabUtils.java
index a47de06..9bb017f 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TabUtils.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TabUtils.java
@@ -33,6 +33,7 @@ public class TabUtils {
     // https://coderanch.com/t/600541/java/JtabbedPane-transparency
     tabbedPane.setUI(
         new javax.swing.plaf.metal.MetalTabbedPaneUI() {
+          @Override
           protected void paintContentBorder(Graphics g, int tabPlacement, int selectedIndex) {}
         });
   }
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/search/SimilarityConfig.java b/lucene/luke/src/java/org/apache/lucene/luke/models/search/SimilarityConfig.java
index 7317149..299fdab 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/models/search/SimilarityConfig.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/search/SimilarityConfig.java
@@ -87,6 +87,7 @@ public final class SimilarityConfig {
     return discountOverlaps;
   }
 
+  @Override
   public String toString() {
     return "SimilarityConfig: ["
         + " use classic similarity="
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/tools/IndexToolsImpl.java b/lucene/luke/src/java/org/apache/lucene/luke/models/tools/IndexToolsImpl.java
index 9583935..facc69e 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/models/tools/IndexToolsImpl.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/tools/IndexToolsImpl.java
@@ -196,6 +196,7 @@ public final class IndexToolsImpl extends LukeModel implements IndexTools {
     }
   }
 
+  @Override
   public String exportTerms(String destDir, String field, String delimiter) {
     String filename = "terms_" + field + "_" + System.currentTimeMillis() + ".out";
     Path path = Paths.get(destDir, filename);
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/util/twentynewsgroups/MessageFilesParser.java b/lucene/luke/src/java/org/apache/lucene/luke/models/util/twentynewsgroups/MessageFilesParser.java
index 38773a1..dbe20bf 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/models/util/twentynewsgroups/MessageFilesParser.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/util/twentynewsgroups/MessageFilesParser.java
@@ -47,6 +47,7 @@ public class MessageFilesParser extends SimpleFileVisitor<Path> {
     this.root = root;
   }
 
+  @Override
   public FileVisitResult visitFile(Path file, BasicFileAttributes attr) {
     try {
       if (attr.isRegularFile()) {
diff --git a/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java b/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java
index 6976fca..b5097fe 100644
--- a/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java
+++ b/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java
@@ -173,6 +173,7 @@ public class SweetSpotSimilarity extends ClassicSimilarity {
     return Float.isNaN(result) ? max : result;
   }
 
+  @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("SweetSpotSimilarity")
diff --git a/lucene/monitor/src/test/org/apache/lucene/monitor/PresearcherTestBase.java b/lucene/monitor/src/test/org/apache/lucene/monitor/PresearcherTestBase.java
index c3ec931..7a39aba 100644
--- a/lucene/monitor/src/test/org/apache/lucene/monitor/PresearcherTestBase.java
+++ b/lucene/monitor/src/test/org/apache/lucene/monitor/PresearcherTestBase.java
@@ -38,6 +38,7 @@ import org.apache.lucene.util.BytesRef;
 
 public abstract class PresearcherTestBase extends MonitorTestBase {
 
+  @Override
   public Monitor newMonitor() throws IOException {
     return new Monitor(WHITESPACE, createPresearcher());
   }
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
index b319248..cd2e225 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
@@ -82,6 +82,7 @@ public class BytesRefFieldSource extends FieldCacheSource {
           }
         }
 
+        @Override
         public String strVal(int doc) throws IOException {
           final BytesRefBuilder bytes = new BytesRefBuilder();
           return bytesVal(doc, bytes) ? bytes.get().utf8ToString() : null;
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
index e369f84..701d4b0 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java
@@ -83,6 +83,7 @@ public abstract class MultiFloatFunction extends ValueSource {
         return func(doc, valsArr);
       }
 
+      @Override
       public boolean exists(int doc) throws IOException {
         return MultiFloatFunction.this.exists(doc, valsArr);
       }
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
index a0f58ae..010f424 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
@@ -219,7 +219,7 @@ ret = MOD_NOT;
 }
 
 // This makes sure that there is no garbage after the query string
-  final public Query TopLevelQuery(String field) throws ParseException {Query q;
+  @Override final public Query TopLevelQuery(String field) throws ParseException {Query q;
     q = Query(field);
     jj_consume_token(0);
 {if ("" != null) return q;}
@@ -813,7 +813,7 @@ if (splitOnWhitespace == false) {
   }
 
   /** Reinitialise. */
-  public void ReInit(CharStream stream) {
+  @Override public void ReInit(CharStream stream) {
      token_source.ReInit(stream);
      token = new Token();
      jj_ntk = -1;
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
index d509a0d..8c4011f 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
@@ -60,6 +60,7 @@ import static org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuery
    * @param query  the query string to be parsed.
    * @throws ParseException if the parsing fails
    */
+  @Override
   public QueryNode parse(CharSequence query, CharSequence field) throws QueryNodeParseException {
     ReInit(new FastCharStream(new StringReader(query.toString())));
     try {
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj
index 4398f4b..08b89c6 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj
@@ -71,6 +71,7 @@ public class StandardSyntaxParser implements SyntaxParser {
    * @param query  the query string to be parsed.
    * @throws ParseException if the parsing fails
    */
+  @Override
   public QueryNode parse(CharSequence query, CharSequence field) throws QueryNodeParseException {
     ReInit(new FastCharStream(new StringReader(query.toString())));
     try {
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java
index f11477c..e9173f6 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java
@@ -185,6 +185,7 @@ public class CoreParser implements SpanQueryBuilder {
     }
   }
 
+  @Override
   public Query getQuery(Element e) throws ParserException {
     return queryFactory.getQuery(e);
   }
diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyOneFile.java b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyOneFile.java
index cf5a05a..a91fbab 100644
--- a/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyOneFile.java
+++ b/lucene/replicator/src/java/org/apache/lucene/replicator/nrt/CopyOneFile.java
@@ -82,6 +82,7 @@ public class CopyOneFile implements Closeable {
     this.buffer = other.buffer;
   }
 
+  @Override
   public void close() throws IOException {
     out.close();
     dest.finishCopyFile(name);
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 f7cd7f1..a353b1e 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
@@ -221,6 +221,7 @@ class SimpleCopyJob extends CopyJob {
     return false;
   }
 
+  @Override
   protected CopyOneFile newCopyOneFile(CopyOneFile prev) {
     return new CopyOneFile(prev, c.in);
   }
@@ -234,6 +235,7 @@ class SimpleCopyJob extends CopyJob {
     }
   }
 
+  @Override
   public synchronized void cancel(String reason, Throwable exc) throws IOException {
     try {
       super.cancel(reason, exc);
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointNearestNeighbor.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointNearestNeighbor.java
index a48155f..675e410 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointNearestNeighbor.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/document/FloatPointNearestNeighbor.java
@@ -61,6 +61,7 @@ public class FloatPointNearestNeighbor {
       this.distanceSquared = distanceSquared;
     }
 
+    @Override
     public int compareTo(Cell other) {
       return Double.compare(distanceSquared, other.distanceSquared);
     }
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/NearestNeighbor.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/NearestNeighbor.java
index e3b0405..1059b44 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/NearestNeighbor.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/NearestNeighbor.java
@@ -67,6 +67,7 @@ class NearestNeighbor {
       this.distanceSortKey = distanceSortKey;
     }
 
+    @Override
     public int compareTo(Cell other) {
       return Double.compare(distanceSortKey, other.distanceSortKey);
     }
diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java
index fa1f22b..709e65a 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/search/TermAutomatonQuery.java
@@ -447,6 +447,7 @@ public class TermAutomatonQuery extends Query implements Accountable {
     }
   }
 
+  @Override
   public Query rewrite(IndexReader reader) throws IOException {
     if (Operations.isEmpty(det)) {
       return new MatchNoDocsQuery();
diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java
index 1f2d678..d796bb8 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/search/TestPhraseWildcardQuery.java
@@ -636,26 +636,32 @@ public class TestPhraseWildcardQuery extends LuceneTestCase {
 
     static final AssertCounters NO_OP =
         new AssertCounters() {
+          @Override
           AssertCounters singleTermAnalysis(int c) {
             return this;
           }
 
+          @Override
           AssertCounters multiTermAnalysis(int c) {
             return this;
           }
 
+          @Override
           AssertCounters segmentUse(int c) {
             return this;
           }
 
+          @Override
           AssertCounters segmentSkip(int c) {
             return this;
           }
 
+          @Override
           AssertCounters queryEarlyStop(int c) {
             return this;
           }
 
+          @Override
           AssertCounters expansion(int c) {
             return this;
           }
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java
index 2bba941..70cf3fe 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java
@@ -33,6 +33,7 @@ abstract class LegacyPrefixTree extends SpatialPrefixTree {
     super(ctx, maxLevels);
   }
 
+  @Override
   public double getDistanceForLevel(int level) {
     if (level < 1 || level > getMaxLevels())
       throw new IllegalArgumentException("Level must be in 1 to maxLevels range");
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java
index 32e08b8..07b1bbe 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java
@@ -82,6 +82,7 @@ public abstract class NumberRangePrefixTree extends SpatialPrefixTree {
    */
   public static interface NRShape extends Shape, Cloneable {
     /** The result should be parseable by {@link #parseShape(String)}. */
+    @Override
     abstract String toString();
 
     /**
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestDateNRStrategy.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestDateNRStrategy.java
index 6af95f2..ad6e36d 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestDateNRStrategy.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestDateNRStrategy.java
@@ -38,6 +38,7 @@ public class TestDateNRStrategy extends RandomSpatialOpStrategyTestCase {
   long randomCalWindowMs;
 
   @Before
+  @Override
   public void setUp() throws Exception {
     super.setUp();
     tree = new DateRangePrefixTree(DateRangePrefixTree.DEFAULT_CAL);
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestHeatmapFacetCounter.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestHeatmapFacetCounter.java
index 6a801dd..8a2f72d 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestHeatmapFacetCounter.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestHeatmapFacetCounter.java
@@ -52,6 +52,7 @@ public class TestHeatmapFacetCounter extends StrategyTestCase {
   int cellValidatedNonZero;
 
   @Before
+  @Override
   public void setUp() throws Exception {
     super.setUp();
     cellsValidated = cellValidatedNonZero = 0;
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestNumberRangeFacets.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestNumberRangeFacets.java
index 1e9ca8d..69418d2 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestNumberRangeFacets.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestNumberRangeFacets.java
@@ -51,6 +51,7 @@ public class TestNumberRangeFacets extends StrategyTestCase {
   long randomCalWindowMs;
 
   @Before
+  @Override
   public void setUp() throws Exception {
     super.setUp();
     tree = new DateRangePrefixTree(DateRangePrefixTree.DEFAULT_CAL);
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree50.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree50.java
index 29ea920..8cb23cc 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree50.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRandomSpatialOpFuzzyPrefixTree50.java
@@ -21,6 +21,7 @@ package org.apache.lucene.spatial.prefix;
  */
 public class TestRandomSpatialOpFuzzyPrefixTree50 extends TestRandomSpatialOpFuzzyPrefixTree {
 
+  @Override
   protected RecursivePrefixTreeStrategy newRPT() {
     return new RecursivePrefixTreeStrategy(this.grid, getClass().getSimpleName()) {
       @Override
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/ShapeRectRelationTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/ShapeRectRelationTestCase.java
index 63eddb3..c3ce0cf 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/ShapeRectRelationTestCase.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/ShapeRectRelationTestCase.java
@@ -48,24 +48,29 @@ public abstract class ShapeRectRelationTestCase extends RandomizedShapeTestCase
 
     // 2 times each -- should be plenty
 
+    @Override
     protected int getContainsMinimum(int laps) {
       return 2;
     }
 
+    @Override
     protected int getIntersectsMinimum(int laps) {
       return 2;
     }
 
     // producing "within" cases in Geo3D based on our random shapes doesn't happen often. It'd be
     // nice to increase this.
+    @Override
     protected int getWithinMinimum(int laps) {
       return 2;
     }
 
+    @Override
     protected int getDisjointMinimum(int laps) {
       return 2;
     }
 
+    @Override
     protected int getBoundingMinimum(int laps) {
       return 2;
     }
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java
index 45e7539..b3585f2 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/TestGeo3dShapeWGS84ModelRectRelation.java
@@ -151,18 +151,21 @@ public class TestGeo3dShapeWGS84ModelRectRelation extends ShapeRectRelationTestC
 
   // very slow, test sources are not all here, no clue how to fix it
   @Nightly
+  @Override
   public void testGeoCircleRect() {
     super.testGeoCircleRect();
   }
 
   // very slow, test sources are not all here, no clue how to fix it
   @Nightly
+  @Override
   public void testGeoPolygonRect() {
     super.testGeoPolygonRect();
   }
 
   // very slow, test sources are not all here, no clue how to fix it
   @Nightly
+  @Override
   public void testGeoPathRect() {
     super.testGeoPathRect();
   }
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Plane.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Plane.java
index 2c4aa0c..ef9e977 100755
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Plane.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Plane.java
@@ -287,6 +287,7 @@ public class Plane extends Vector {
    *
    * @return the normalized plane object, or null if the plane is indeterminate.
    */
+  @Override
   public Plane normalize() {
     Vector normVect = super.normalize();
     if (normVect == null) return null;
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/XYZBounds.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/XYZBounds.java
index 6f458b5..31835ae 100644
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/XYZBounds.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/XYZBounds.java
@@ -195,6 +195,7 @@ public class XYZBounds implements Bounds {
    * @param bounds are the constraints on the plane.
    * @return updated Bounds object.
    */
+  @Override
   public Bounds addHorizontalPlane(
       final PlanetModel planetModel,
       final double latitude,
@@ -213,6 +214,7 @@ public class XYZBounds implements Bounds {
    * @param bounds are the constraints on the plane.
    * @return updated Bounds object.
    */
+  @Override
   public Bounds addVerticalPlane(
       final PlanetModel planetModel,
       final double longitude,
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
index 6f84bf7..1153660 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
@@ -611,6 +611,7 @@ public class AnalyzingInfixSuggester extends Lookup implements Closeable {
    * @return the result of the suggester
    * @throws IOException f the is IO exception while reading data from the index
    */
+  @Override
   public List<LookupResult> lookup(
       CharSequence key,
       BooleanQuery contextQuery,
diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java
index d996216..a6b11e1 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/uniformsplit/sharedterms/STUniformSplitRot13PostingsFormat.java
@@ -36,6 +36,7 @@ public class STUniformSplitRot13PostingsFormat extends UniformSplitRot13Postings
     super("STUniformSplitRot13", false);
   }
 
+  @Override
   protected FieldsConsumer createFieldsConsumer(
       SegmentWriteState segmentWriteState, PostingsWriterBase postingsWriter) throws IOException {
     return new STUniformSplitTermsWriter(
@@ -61,6 +62,7 @@ public class STUniformSplitRot13PostingsFormat extends UniformSplitRot13Postings
     };
   }
 
+  @Override
   protected FieldsProducer createFieldsProducer(
       SegmentReadState segmentReadState, PostingsReaderBase postingsReader) throws IOException {
     return new STUniformSplitTermsReader(
diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
index 74fb4bf..c3e59f5 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
@@ -116,6 +116,7 @@ abstract class BaseIndexFileFormatTestCase extends LuceneTestCase {
       this.root = root;
     }
 
+    @Override
     public long accumulateObject(
         Object o,
         long shallowSize,
@@ -185,6 +186,7 @@ abstract class BaseIndexFileFormatTestCase extends LuceneTestCase {
 
   private Codec savedCodec;
 
+  @Override
   public void setUp() throws Exception {
     super.setUp();
     // set the default codec, so adding test cases to this isn't fragile
@@ -192,6 +194,7 @@ abstract class BaseIndexFileFormatTestCase extends LuceneTestCase {
     Codec.setDefault(getCodec());
   }
 
+  @Override
   public void tearDown() throws Exception {
     Codec.setDefault(savedCodec); // restore
     super.tearDown();
diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java
index e403817..1248cf6 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointsFormatTestCase.java
@@ -89,10 +89,12 @@ public abstract class BasePointsFormatTestCase extends BaseIndexFileFormatTestCa
             return Relation.CELL_CROSSES_QUERY;
           }
 
+          @Override
           public void visit(int docID) {
             throw new IllegalStateException();
           }
 
+          @Override
           public void visit(int docID, byte[] packedValue) {
             seen.set(docID);
             assertEquals(docID, NumericUtils.sortableBytesToInt(packedValue, 0));
@@ -133,10 +135,12 @@ public abstract class BasePointsFormatTestCase extends BaseIndexFileFormatTestCa
             return Relation.CELL_CROSSES_QUERY;
           }
 
+          @Override
           public void visit(int docID) {
             throw new IllegalStateException();
           }
 
+          @Override
           public void visit(int docID, byte[] packedValue) {
             seen.set(docID);
             assertEquals(docID, NumericUtils.sortableBytesToInt(packedValue, 0));
@@ -195,10 +199,12 @@ public abstract class BasePointsFormatTestCase extends BaseIndexFileFormatTestCa
                 return Relation.CELL_CROSSES_QUERY;
               }
 
+              @Override
               public void visit(int docID) {
                 throw new IllegalStateException();
               }
 
+              @Override
               public void visit(int docID, byte[] packedValue) {
                 if (liveDocs.get(docID)) {
                   seen.set(docID);
diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
index 275cbee..5fe55ca 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
@@ -131,6 +131,7 @@ public class RandomCodec extends AssertingCodec {
                           throw new IllegalStateException();
                         }
 
+                        @Override
                         public void visit(int docID, byte[] packedValue) throws IOException {
                           writer.add(packedValue, docID);
                         }
diff --git a/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java b/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java
index e70648b..f69e22e 100644
--- a/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java
+++ b/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java
@@ -92,10 +92,12 @@ public class TestBaseExplanationTestCase extends BaseExplanationTestCase {
       super(q, in);
     }
 
+    @Override
     public BulkScorer bulkScorer(LeafReaderContext context) throws IOException {
       return in.bulkScorer(context);
     }
 
+    @Override
     public Explanation explain(LeafReaderContext context, int doc) throws IOException {
       BrokenExplainTermQuery q = (BrokenExplainTermQuery) this.getQuery();
       Explanation result = in.explain(context, doc);
diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java b/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java
index 4e88e5c..567b4e3 100644
--- a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java
+++ b/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java
@@ -73,7 +73,8 @@ public abstract class WithNestedTests {
           new TestRuleAdapter() {
             private TestRuleIgnoreAfterMaxFailures prevRule;
 
-            protected void before() throws Throwable {
+            @Override
+            protected void before() {
               if (!isPropertyEmpty(SysGlobals.SYSPROP_TESTFILTER())
                   || !isPropertyEmpty(SysGlobals.SYSPROP_TESTCLASS())
                   || !isPropertyEmpty(SysGlobals.SYSPROP_TESTMETHOD())
@@ -95,7 +96,8 @@ public abstract class WithNestedTests {
               RandomizedTest.assumeFalse(FailureMarker.hadFailures());
             }
 
-            protected void afterAlways(List<Throwable> errors) throws Throwable {
+            @Override
+            protected void afterAlways(List<Throwable> errors) {
               if (prevRule != null) {
                 LuceneTestCase.replaceMaxFailureRule(prevRule);
               }