diff --git a/rewrite-core/src/main/java/org/openrewrite/DocumentExample.java b/rewrite-core/src/main/java/org/openrewrite/DocumentExample.java
index f4155744be6..7685ebfb8b4 100644
--- a/rewrite-core/src/main/java/org/openrewrite/DocumentExample.java
+++ b/rewrite-core/src/main/java/org/openrewrite/DocumentExample.java
@@ -26,4 +26,3 @@
 public @interface DocumentExample {
     String value() default "";
 }
-
diff --git a/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java b/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java
index cdc9dd08e19..49efd7381ff 100644
--- a/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java
+++ b/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java
@@ -73,6 +73,7 @@ public <T> T pollMessage(String key) {
         return (T) messages.remove(key);
     }
 
+    @Override
     public Consumer<Throwable> getOnError() {
         return onError;
     }
diff --git a/rewrite-core/src/main/java/org/openrewrite/RecipeRun.java b/rewrite-core/src/main/java/org/openrewrite/RecipeRun.java
index 6325fe002c0..7a43ffe2881 100644
--- a/rewrite-core/src/main/java/org/openrewrite/RecipeRun.java
+++ b/rewrite-core/src/main/java/org/openrewrite/RecipeRun.java
@@ -21,11 +21,7 @@
 import org.openrewrite.config.DataTableDescriptor;
 import org.openrewrite.internal.lang.Nullable;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.*;
 import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/rewrite-core/src/main/java/org/openrewrite/SourceFile.java b/rewrite-core/src/main/java/org/openrewrite/SourceFile.java
index 5c7b4c5dc59..038052eb8ff 100644
--- a/rewrite-core/src/main/java/org/openrewrite/SourceFile.java
+++ b/rewrite-core/src/main/java/org/openrewrite/SourceFile.java
@@ -108,6 +108,7 @@ default String printAllTrimmed() {
         return printAllTrimmed(0);
     }
 
+    @Override
     default <P> TreeVisitor<?, PrintOutputCapture<P>> printer(Cursor cursor) {
         throw new UnsupportedOperationException("SourceFile implementations should override this method");
     }
diff --git a/rewrite-core/src/main/java/org/openrewrite/binary/BinaryParser.java b/rewrite-core/src/main/java/org/openrewrite/binary/BinaryParser.java
index 5ddd92490fc..ffb35554698 100755
--- a/rewrite-core/src/main/java/org/openrewrite/binary/BinaryParser.java
+++ b/rewrite-core/src/main/java/org/openrewrite/binary/BinaryParser.java
@@ -16,11 +16,11 @@
 package org.openrewrite.binary;
 
 import org.openrewrite.ExecutionContext;
-import org.openrewrite.tree.ParseError;
 import org.openrewrite.Parser;
 import org.openrewrite.SourceFile;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.marker.Markers;
+import org.openrewrite.tree.ParseError;
 
 import java.nio.file.Path;
 import java.util.stream.Stream;
diff --git a/rewrite-core/src/main/java/org/openrewrite/config/CategoryTree.java b/rewrite-core/src/main/java/org/openrewrite/config/CategoryTree.java
index c9a839e8ba4..c591e9345f4 100644
--- a/rewrite-core/src/main/java/org/openrewrite/config/CategoryTree.java
+++ b/rewrite-core/src/main/java/org/openrewrite/config/CategoryTree.java
@@ -72,6 +72,7 @@ private Root() {
             super();
         }
 
+        @Override
         public CategoryTree.Root<G> removeAll(G group) {
             // increase visibility and cast
             return (Root<G>) super.removeAll(group);
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/TreeVisitorAdapterClassLoader.java b/rewrite-core/src/main/java/org/openrewrite/internal/TreeVisitorAdapterClassLoader.java
index ec47901454d..060a2be4496 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/TreeVisitorAdapterClassLoader.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/TreeVisitorAdapterClassLoader.java
@@ -77,6 +77,7 @@ public void write(String name, byte[] data) {
         );
     }
 
+    @Override
     public Writer getSourceWriter(String className) {
         return new Writer() {
             @Override
diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/GitProvenance.java b/rewrite-core/src/main/java/org/openrewrite/marker/GitProvenance.java
index 3aa571be370..6c933807068 100644
--- a/rewrite-core/src/main/java/org/openrewrite/marker/GitProvenance.java
+++ b/rewrite-core/src/main/java/org/openrewrite/marker/GitProvenance.java
@@ -18,6 +18,8 @@
 
 import lombok.Value;
 import lombok.With;
+import org.openrewrite.Incubating;
+import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.jgit.api.Git;
 import org.openrewrite.jgit.api.errors.GitAPIException;
 import org.openrewrite.jgit.lib.*;
@@ -25,8 +27,6 @@
 import org.openrewrite.jgit.transport.RemoteConfig;
 import org.openrewrite.jgit.transport.URIish;
 import org.openrewrite.jgit.treewalk.WorkingTreeOptions;
-import org.openrewrite.Incubating;
-import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.marker.ci.BuildEnvironment;
 import org.openrewrite.marker.ci.IncompleteGitConfigException;
 import org.openrewrite.marker.ci.JenkinsBuildEnvironment;
diff --git a/rewrite-core/src/main/java/org/openrewrite/remote/Remote.java b/rewrite-core/src/main/java/org/openrewrite/remote/Remote.java
index daed280455d..9febfb17582 100644
--- a/rewrite-core/src/main/java/org/openrewrite/remote/Remote.java
+++ b/rewrite-core/src/main/java/org/openrewrite/remote/Remote.java
@@ -56,10 +56,12 @@ public interface Remote extends SourceFile {
     <R extends Remote> R withDescription(String description);
 
     @Nullable
+    @Override
     default Checksum getChecksum() {
         return null;
     }
 
+    @Override
     default <T extends SourceFile> T withChecksum(@Nullable Checksum checksum) {
         //noinspection unchecked
         return (T) this;
diff --git a/rewrite-core/src/main/java/org/openrewrite/text/PlainTextVisitor.java b/rewrite-core/src/main/java/org/openrewrite/text/PlainTextVisitor.java
index fdbe27385d0..4b54815f083 100755
--- a/rewrite-core/src/main/java/org/openrewrite/text/PlainTextVisitor.java
+++ b/rewrite-core/src/main/java/org/openrewrite/text/PlainTextVisitor.java
@@ -27,6 +27,7 @@ public boolean isAcceptable(SourceFile sourceFile, P p) {
         return sourceFile instanceof PlainText;
     }
 
+    @Override
     public boolean isAdaptableTo(@SuppressWarnings("rawtypes") Class<? extends TreeVisitor> adaptTo) {
         if (adaptTo.isAssignableFrom(getClass())) {
             return true;
diff --git a/rewrite-core/src/test/java/org/openrewrite/internal/InMemoryDiffEntryTest.java b/rewrite-core/src/test/java/org/openrewrite/internal/InMemoryDiffEntryTest.java
index d006926eb0f..6ffb2ec97d1 100644
--- a/rewrite-core/src/test/java/org/openrewrite/internal/InMemoryDiffEntryTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/internal/InMemoryDiffEntryTest.java
@@ -15,9 +15,9 @@
  */
 package org.openrewrite.internal;
 
-import org.openrewrite.jgit.lib.FileMode;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.openrewrite.jgit.lib.FileMode;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/rewrite-core/src/test/java/org/openrewrite/marker/GitProvenanceTest.java b/rewrite-core/src/test/java/org/openrewrite/marker/GitProvenanceTest.java
index 915ddb2f7f1..5175cc359da 100644
--- a/rewrite-core/src/test/java/org/openrewrite/marker/GitProvenanceTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/marker/GitProvenanceTest.java
@@ -15,6 +15,12 @@
  */
 package org.openrewrite.marker;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.openrewrite.jgit.api.Git;
 import org.openrewrite.jgit.api.errors.GitAPIException;
 import org.openrewrite.jgit.lib.Constants;
@@ -22,12 +28,6 @@
 import org.openrewrite.jgit.transport.TagOpt;
 import org.openrewrite.jgit.transport.URIish;
 import org.openrewrite.jgit.util.FS;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
 import org.openrewrite.marker.ci.*;
 
 import java.io.ByteArrayOutputStream;
@@ -44,9 +44,9 @@
 
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.openrewrite.jgit.lib.ConfigConstants.CONFIG_BRANCH_SECTION;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.openrewrite.Tree.randomId;
+import static org.openrewrite.jgit.lib.ConfigConstants.CONFIG_BRANCH_SECTION;
 
 @SuppressWarnings({"ConstantConditions", "HttpUrlsUsage"})
 class GitProvenanceTest {
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/GradleParser.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/GradleParser.java
index 970443b2ae3..8a7428d7c60 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/GradleParser.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/GradleParser.java
@@ -147,6 +147,7 @@ public Builder settingsClasspathFromResources(ExecutionContext ctx, String... ar
             return this;
         }
 
+        @Override
         public GradleParser build() {
             return new GradleParser(this);
         }
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveEnableFeaturePreviewTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveEnableFeaturePreviewTest.java
index 0c5af08de8a..dee944323b3 100644
--- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveEnableFeaturePreviewTest.java
+++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveEnableFeaturePreviewTest.java
@@ -135,4 +135,4 @@ void nullArgument() {
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyIsoVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyIsoVisitor.java
index ad3b89645e6..c57bdaf3a6f 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyIsoVisitor.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyIsoVisitor.java
@@ -22,26 +22,32 @@
 
 public class GroovyIsoVisitor<P> extends GroovyVisitor<P> {
 
+    @Override
     public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, P p) {
         return (G.CompilationUnit) super.visitCompilationUnit(cu, p);
     }
 
+    @Override
     public G.GString visitGString(G.GString gString, P p) {
         return (G.GString) super.visitGString(gString, p);
     }
 
+    @Override
     public G.GString.Value visitGStringValue(G.GString.Value value, P p) {
         return (G.GString.Value) super.visitGStringValue(value, p);
     }
 
+    @Override
     public G.ListLiteral visitListLiteral(G.ListLiteral listLiteral, P p) {
         return (G.ListLiteral) super.visitListLiteral(listLiteral, p);
     }
 
+    @Override
     public G.MapLiteral visitMapLiteral(G.MapLiteral mapLiteral, P p) {
         return (G.MapLiteral) super.visitMapLiteral(mapLiteral, p);
     }
 
+    @Override
     public G.Binary visitBinary(G.Binary binary, P p) {
         return (G.Binary) super.visitBinary(binary, p);
     }
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParser.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParser.java
index 4a52ea654aa..7bc4cf79e75 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParser.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParser.java
@@ -286,6 +286,7 @@ private Collection<Path> resolvedClasspath() {
             return classpath;
         }
 
+        @Override
         public GroovyParser build() {
             return new GroovyParser(resolvedClasspath(), styles, logCompilationWarningsAndErrors, typeCache, compilerCustomizers);
         }
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java
index 4e8c790df4c..89dd5b4476c 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java
@@ -36,9 +36,9 @@
 import org.openrewrite.java.internal.JavaTypeCache;
 import org.openrewrite.java.marker.ImplicitReturn;
 import org.openrewrite.java.marker.Semicolon;
+import org.openrewrite.java.tree.*;
 import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.Statement;
-import org.openrewrite.java.tree.*;
 import org.openrewrite.marker.Markers;
 
 import java.math.BigDecimal;
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java
index f592fc9cc3c..063a63baf29 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java
@@ -43,6 +43,7 @@ class GroovyTypeMapping implements JavaTypeMapping<ASTNode> {
         this.reflectionTypeMapping = new JavaReflectionTypeMapping(typeCache);
     }
 
+    @Override
     public JavaType type(@Nullable ASTNode type) {
         if (type == null) {
             return JavaType.Class.Unknown.getInstance();
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/tree/G.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/tree/G.java
index f3576fb4e4f..35fabf8b793 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/tree/G.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/tree/G.java
@@ -57,8 +57,10 @@ default <P> J acceptGroovy(GroovyVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
+    @Override
     Space getPrefix();
 
+    @Override
     default List<Comment> getComments() {
         return getPrefix().getComments();
     }
@@ -132,10 +134,12 @@ public SourceFile withCharset(Charset charset) {
         JRightPadded<Package> packageDeclaration;
 
         @Nullable
+        @Override
         public Package getPackageDeclaration() {
             return packageDeclaration == null ? null : packageDeclaration.getElement();
         }
 
+        @Override
         public G.CompilationUnit withPackageDeclaration(Package packageDeclaration) {
             return getPadding().withPackageDeclaration(JRightPadded.withElement(this.packageDeclaration, packageDeclaration));
         }
@@ -175,6 +179,7 @@ public G.CompilationUnit withStatements(List<Statement> statements) {
         @Getter
         Space eof;
 
+        @Override
         @Transient
         public List<Import> getImports() {
             return statements.stream()
@@ -184,10 +189,12 @@ public List<Import> getImports() {
                     .collect(Collectors.toList());
         }
 
+        @Override
         public G.CompilationUnit withImports(List<Import> imports) {
             return getPadding().withImports(JRightPadded.withElements(this.getPadding().getImports(), imports));
         }
 
+        @Override
         @Transient
         public List<ClassDeclaration> getClasses() {
             return statements.stream()
@@ -212,6 +219,7 @@ public <P> TreeVisitor<?, PrintOutputCapture<P>> printer(Cursor cursor) {
             return new GroovyPrinter<>();
         }
 
+        @Override
         @Transient
         public TypesInUse getTypesInUse() {
             TypesInUse cache;
@@ -228,6 +236,7 @@ public TypesInUse getTypesInUse() {
             return cache;
         }
 
+        @Override
         public Padding getPadding() {
             Padding p;
             if (this.padding == null) {
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclParser.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclParser.java
index 35d3db65a20..9e75d88a0fd 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclParser.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclParser.java
@@ -17,7 +17,6 @@
 
 import org.antlr.v4.runtime.*;
 import org.openrewrite.ExecutionContext;
-import org.openrewrite.tree.ParseError;
 import org.openrewrite.Parser;
 import org.openrewrite.SourceFile;
 import org.openrewrite.hcl.internal.HclParserVisitor;
@@ -28,6 +27,7 @@
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.marker.Markers;
 import org.openrewrite.style.NamedStyles;
+import org.openrewrite.tree.ParseError;
 import org.openrewrite.tree.ParsingEventListener;
 import org.openrewrite.tree.ParsingExecutionContextView;
 
@@ -124,6 +124,7 @@ public Builder styles(Iterable<? extends NamedStyles> styles) {
             return this;
         }
 
+        @Override
         public HclParser build() {
             return new HclParser(styles);
         }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.java
index da52f078f6a..838bbfe0327 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.java
@@ -128,8 +128,8 @@ private enum CurlyType {
 	        OBJECT
 	    }
 
-	    private Stack<CurlyType> leftCurlyStack = new Stack<CurlyType>();
-	    private Stack<String> heredocIdentifier = new Stack<String>();
+	    private Stack<CurlyType> leftCurlyStack = new Stack<>();
+	    private Stack<String> heredocIdentifier = new Stack<>();
 
 
 	public HCLLexer(CharStream input) {
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.java
index f32221ad366..61f365cdc95 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.java
@@ -3240,7 +3240,8 @@ public final TemplateInterpolationContext templateInterpolation() throws Recogni
 		return _localctx;
 	}
 
-	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
+    @Override
+    public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 		switch (ruleIndex) {
 		case 6:
 			return expression_sempred((ExpressionContext)_localctx, predIndex);
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/JsonPathParser.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/JsonPathParser.java
index 9b4ac703917..11c42d9e588 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/JsonPathParser.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/JsonPathParser.java
@@ -1509,7 +1509,8 @@ public final IndexesContext indexes() throws RecognitionException {
 		return _localctx;
 	}
 
-	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
+    @Override
+    public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 		switch (ruleIndex) {
 		case 7:
 			return binaryExpression_sempred((BinaryExpressionContext)_localctx, predIndex);
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/BodyContent.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/BodyContent.java
index 385d2f8d58d..d8b416d4c63 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/BodyContent.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/BodyContent.java
@@ -16,5 +16,6 @@
 package org.openrewrite.hcl.tree;
 
 public interface BodyContent extends Hcl {
+    @Override
     BodyContent withPrefix(Space prefix);
 }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/CollectionValue.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/CollectionValue.java
index 3a1fa5bae4e..8cd060ca234 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/CollectionValue.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/CollectionValue.java
@@ -16,5 +16,6 @@
 package org.openrewrite.hcl.tree;
 
 public interface CollectionValue extends Expression {
+    @Override
     CollectionValue withPrefix(Space prefix);
 }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/CoordinateBuilder.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/CoordinateBuilder.java
index 84cb3d8041a..fa4f9177baa 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/CoordinateBuilder.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/CoordinateBuilder.java
@@ -59,6 +59,7 @@ public HclCoordinates add(Comparator<BodyContent> idealOrdering) {
             return new HclCoordinates(tree, Space.Location.BLOCK_CLOSE, HclCoordinates.Mode.BEFORE, idealOrdering);
         }
 
+        @Override
         public HclCoordinates replace() {
             return replace(Space.Location.BLOCK);
         }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Hcl.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Hcl.java
index b70fbf8d0ed..c46f0c714e5 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Hcl.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/Hcl.java
@@ -436,6 +436,7 @@ public <T> T getAttributeValue(String attrName) {
         @With
         Space end;
 
+        @Override
         public CoordinateBuilder.Block getCoordinates() {
             return new CoordinateBuilder.Block(this);
         }
diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11Parser.java b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11Parser.java
index f5de9feb6e6..12ef7468914 100644
--- a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11Parser.java
+++ b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11Parser.java
@@ -29,7 +29,6 @@
 import org.objectweb.asm.Opcodes;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.InMemoryExecutionContext;
-import org.openrewrite.tree.ParseError;
 import org.openrewrite.SourceFile;
 import org.openrewrite.internal.MetricsHelper;
 import org.openrewrite.internal.StringUtils;
@@ -41,6 +40,7 @@
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.Space;
 import org.openrewrite.style.NamedStyles;
+import org.openrewrite.tree.ParseError;
 import org.openrewrite.tree.ParsingEventListener;
 import org.openrewrite.tree.ParsingExecutionContextView;
 
@@ -252,6 +252,7 @@ public JavaParser reset(Collection<URI> uris) {
         return this;
     }
 
+    @Override
     public void setClasspath(Collection<Path> classpath) {
         this.classpath = classpath;
     }
diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11TypeMapping.java b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11TypeMapping.java
index 1e9776ccabb..d12c12036e9 100644
--- a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11TypeMapping.java
+++ b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11TypeMapping.java
@@ -337,6 +337,7 @@ private JavaType.Class.Kind getKind(Symbol.ClassSymbol sym) {
         return kind;
     }
 
+    @Override
     @SuppressWarnings("ConstantConditions")
     public JavaType type(@Nullable Tree tree) {
         if (tree == null) {
diff --git a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java
index 3afd12d0ac5..01449e898cc 100644
--- a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java
+++ b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17JavadocVisitor.java
@@ -15,14 +15,14 @@
  */
 package org.openrewrite.java.isolated;
 
+import com.sun.source.doctree.*;
 import com.sun.source.doctree.ErroneousTree;
 import com.sun.source.doctree.LiteralTree;
 import com.sun.source.doctree.ProvidesTree;
 import com.sun.source.doctree.ReturnTree;
 import com.sun.source.doctree.UsesTree;
-import com.sun.source.doctree.*;
-import com.sun.source.tree.IdentifierTree;
 import com.sun.source.tree.*;
+import com.sun.source.tree.IdentifierTree;
 import com.sun.source.util.DocTreeScanner;
 import com.sun.source.util.TreePath;
 import com.sun.source.util.TreeScanner;
diff --git a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17Parser.java b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17Parser.java
index d6bb5321ecf..f05e0be180f 100644
--- a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17Parser.java
+++ b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17Parser.java
@@ -250,6 +250,7 @@ public JavaParser reset(Collection<URI> uris) {
         return this;
     }
 
+    @Override
     public void setClasspath(Collection<Path> classpath) {
         this.classpath = classpath;
     }
diff --git a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17TypeMapping.java b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17TypeMapping.java
index be75d34509b..20b788c5ed1 100644
--- a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17TypeMapping.java
+++ b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17TypeMapping.java
@@ -336,6 +336,7 @@ private JavaType.FullyQualified.Kind getKind(Symbol.ClassSymbol sym) {
         }
     }
 
+    @Override
     @SuppressWarnings("ConstantConditions")
     public JavaType type(@Nullable Tree tree) {
         if (tree == null) {
diff --git a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21JavadocVisitor.java b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21JavadocVisitor.java
index f1dd5fb23db..c62c4a91c7c 100644
--- a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21JavadocVisitor.java
+++ b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21JavadocVisitor.java
@@ -15,14 +15,14 @@
  */
 package org.openrewrite.java.isolated;
 
+import com.sun.source.doctree.*;
 import com.sun.source.doctree.ErroneousTree;
 import com.sun.source.doctree.LiteralTree;
 import com.sun.source.doctree.ProvidesTree;
 import com.sun.source.doctree.ReturnTree;
 import com.sun.source.doctree.UsesTree;
-import com.sun.source.doctree.*;
-import com.sun.source.tree.IdentifierTree;
 import com.sun.source.tree.*;
+import com.sun.source.tree.IdentifierTree;
 import com.sun.source.util.DocTreeScanner;
 import com.sun.source.util.TreePath;
 import com.sun.source.util.TreeScanner;
diff --git a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21Parser.java b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21Parser.java
index 5ccba7e4a56..ba712d44646 100644
--- a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21Parser.java
+++ b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21Parser.java
@@ -250,6 +250,7 @@ public JavaParser reset(Collection<URI> uris) {
         return this;
     }
 
+    @Override
     public void setClasspath(Collection<Path> classpath) {
         this.classpath = classpath;
     }
diff --git a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21TypeMapping.java b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21TypeMapping.java
index c3f2ae59fd6..260213913bf 100644
--- a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21TypeMapping.java
+++ b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21TypeMapping.java
@@ -354,6 +354,7 @@ private JavaType.FullyQualified.Kind getKind(Symbol.ClassSymbol sym) {
         }
     }
 
+    @Override
     @SuppressWarnings("ConstantConditions")
     public JavaType type(@Nullable Tree tree) {
         if (tree == null) {
diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java
index b110f87e444..915f4628228 100644
--- a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java
+++ b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java
@@ -29,7 +29,6 @@
 import org.objectweb.asm.Opcodes;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.InMemoryExecutionContext;
-import org.openrewrite.tree.ParseError;
 import org.openrewrite.SourceFile;
 import org.openrewrite.internal.MetricsHelper;
 import org.openrewrite.internal.StringUtils;
@@ -38,6 +37,7 @@
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.Space;
 import org.openrewrite.style.NamedStyles;
+import org.openrewrite.tree.ParseError;
 import org.openrewrite.tree.ParsingEventListener;
 import org.openrewrite.tree.ParsingExecutionContextView;
 
diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeMapping.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeMapping.java
index 9211e0066ce..ffb952193c6 100644
--- a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeMapping.java
+++ b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8TypeMapping.java
@@ -337,6 +337,7 @@ private JavaType.Class.Kind getKind(Symbol.ClassSymbol sym) {
         return kind;
     }
 
+    @Override
     @SuppressWarnings("ConstantConditions")
     public JavaType type(@Nullable Tree tree) {
         if (tree == null) {
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/JavaVisitorTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/JavaVisitorTest.java
index b4e3f6e45be..8c3e7fc9e22 100644
--- a/rewrite-java-test/src/test/java/org/openrewrite/java/JavaVisitorTest.java
+++ b/rewrite-java-test/src/test/java/org/openrewrite/java/JavaVisitorTest.java
@@ -84,7 +84,7 @@ void removeMethod() {}
 
     @Test
     void topVisitor() {
-        final JavaIsoVisitor<ExecutionContext> afterVisitor = new JavaIsoVisitor<ExecutionContext>() {
+        final JavaIsoVisitor<ExecutionContext> afterVisitor = new JavaIsoVisitor<>() {
             @Override
             public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext p) {
                 for (Cursor parent = getCursor().getParent(); parent != null; parent = parent.getParent()) {
diff --git a/rewrite-java-test/src/test/resources/dataflow-functional-tests/FileUtils.java b/rewrite-java-test/src/test/resources/dataflow-functional-tests/FileUtils.java
index 73e970f8bbf..2976e2f06e4 100644
--- a/rewrite-java-test/src/test/resources/dataflow-functional-tests/FileUtils.java
+++ b/rewrite-java-test/src/test/resources/dataflow-functional-tests/FileUtils.java
@@ -360,7 +360,7 @@ public static Collection<File> listFiles(
         }
 
         //Find files
-        Collection<File> files = new java.util.LinkedList<File>();
+        Collection<File> files = new java.util.LinkedList<>();
         innerListFiles(files, directory,
                 FileFilterUtils.or(effFileFilter, effDirFilter));
         return files;
@@ -1030,7 +1030,7 @@ public static void copyDirectory(File srcDir, File destDir,
         if (canonicalDestDir.startsWith(srcDir.getCanonicalPath())) {
             File[] srcFiles = filter == null ? srcDir.listFiles() : srcDir.listFiles(filter);
             if (srcFiles != null && srcFiles.length > 0) {
-                exclusionList = new ArrayList<String>(srcFiles.length);
+                exclusionList = new ArrayList<>(srcFiles.length);
                 for (File srcFile : srcFiles) {
                     File copiedFile = new File(destDir, srcFile.getName());
                     exclusionList.add(copiedFile.getCanonicalPath());
diff --git a/rewrite-java-test/src/test/resources/dataflow-functional-tests/JavaTypeGoat.java b/rewrite-java-test/src/test/resources/dataflow-functional-tests/JavaTypeGoat.java
index 8912f57577b..33982a803a8 100644
--- a/rewrite-java-test/src/test/resources/dataflow-functional-tests/JavaTypeGoat.java
+++ b/rewrite-java-test/src/test/resources/dataflow-functional-tests/JavaTypeGoat.java
@@ -23,7 +23,7 @@
 @AnnotationWithSourceRetention
 public abstract class JavaTypeGoat<T, S extends PT<S> & C> {
 
-    public static final PT<TypeA> parameterizedField = new PT<TypeA>() {
+    public static final PT<TypeA> parameterizedField = new PT<>() {
     };
 
     public static abstract class InheritedJavaTypeGoat<T, U extends PT<U> & C> extends JavaTypeGoat<T, U> {
diff --git a/rewrite-java-test/src/test/resources/dataflow-functional-tests/SecurityUtils.java b/rewrite-java-test/src/test/resources/dataflow-functional-tests/SecurityUtils.java
index 086f409e850..c441026589a 100644
--- a/rewrite-java-test/src/test/resources/dataflow-functional-tests/SecurityUtils.java
+++ b/rewrite-java-test/src/test/resources/dataflow-functional-tests/SecurityUtils.java
@@ -30,14 +30,14 @@
 public final class SecurityUtils {
     private static Logger log = LoggerFactory.getLogger(SecurityUtils.class);
 
-    private static Set<String> SCHEMES = new HashSet<String>() {{
+    private static Set<String> SCHEMES = new HashSet<>() {{
         add("http");
         add("https");
         add("HTTP");
         add("HTTPS");
     }};
 
-    private static Set<Integer> PORTS = new HashSet<Integer>() {{
+    private static Set<Integer> PORTS = new HashSet<>() {{
         add(443);
         add(80);
         add(3000); // we allow port 3000 for SAM local
diff --git a/rewrite-java-test/src/test/resources/dataflow-functional-tests/TestAssignmentToNull.java b/rewrite-java-test/src/test/resources/dataflow-functional-tests/TestAssignmentToNull.java
index f5c9237d3ba..5f4beb9fc34 100644
--- a/rewrite-java-test/src/test/resources/dataflow-functional-tests/TestAssignmentToNull.java
+++ b/rewrite-java-test/src/test/resources/dataflow-functional-tests/TestAssignmentToNull.java
@@ -27,7 +27,7 @@ void test2(File srcDir, File destDir, FileFilter filter) {
         if (canonicalDestDir.startsWith(srcDir.getCanonicalPath())) {
             File[] srcFiles = filter == null ? srcDir.listFiles() : srcDir.listFiles(filter);
             if (srcFiles != null && srcFiles.length > 0) {
-                exclusionList = new ArrayList<String>(srcFiles.length);
+                exclusionList = new ArrayList<>(srcFiles.length);
                 for (File srcFile : srcFiles) {
                     File copiedFile = new File(destDir, srcFile.getName());
                     exclusionList.add(copiedFile.getCanonicalPath());
diff --git a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.java b/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.java
index 1e8cb4d7b5b..a1d5315372f 100644
--- a/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.java
+++ b/rewrite-java-test/src/test/resources/javaparser-byte-array-tests/InterfaceB.java
@@ -15,4 +15,4 @@
  */
 public interface InterfaceB {
 	void methodB();
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java
index 6448e2b8519..aa27110fc6b 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/JavaParser.java
@@ -295,6 +295,7 @@ default boolean accept(Path path) {
      * Clear any in-memory parser caches that may prevent re-parsing of classes with the same fully qualified name in
      * different rounds
      */
+    @Override
     JavaParser reset();
 
     JavaParser reset(Collection<URI> uris);
@@ -405,6 +406,7 @@ protected Collection<Path> resolvedClasspath() {
             return classpath;
         }
 
+        @Override
         public abstract P build();
 
         @Override
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaParserExecutionContextView.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaParserExecutionContextView.java
index 061475c730b..83dfc2a8181 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/JavaParserExecutionContextView.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/JavaParserExecutionContextView.java
@@ -53,4 +53,3 @@ public File getParserClasspathDownloadTarget() {
         return target;
     }
 }
-
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaPrinter.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaPrinter.java
index 3c073af41bf..03f677d1bcc 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/JavaPrinter.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/JavaPrinter.java
@@ -563,6 +563,7 @@ public J visitElse(If.Else else_, PrintOutputCapture<P> p) {
         return else_;
     }
 
+    @Override
     public J visitEmpty(J.Empty empty, PrintOutputCapture<P> p) {
         beforeSyntax(empty, Space.Location.EMPTY_PREFIX, p);
         afterSyntax(empty, p);
@@ -1042,6 +1043,7 @@ public J visitTry(Try tryable, PrintOutputCapture<P> p) {
         return tryable;
     }
 
+    @Override
     public J visitTypeCast(J.TypeCast typeCast, PrintOutputCapture<P> p) {
         beforeSyntax(typeCast, Space.Location.TYPE_CAST_PREFIX, p);
         visit(typeCast.getClazz(), p);
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/RemoveAnnotationVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/RemoveAnnotationVisitor.java
index de2c29a1c5a..2c58ad3c6a1 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/RemoveAnnotationVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/RemoveAnnotationVisitor.java
@@ -20,11 +20,7 @@
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.internal.ListUtils;
 import org.openrewrite.internal.lang.NonNull;
-import org.openrewrite.java.tree.Expression;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JavaType;
-import org.openrewrite.java.tree.Space;
-import org.openrewrite.java.tree.TypeUtils;
+import org.openrewrite.java.tree.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ReplaceAnnotation.java b/rewrite-java/src/main/java/org/openrewrite/java/ReplaceAnnotation.java
index 03b8e237c1f..641bd93178f 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/ReplaceAnnotation.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/ReplaceAnnotation.java
@@ -97,4 +97,3 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
         }
     }
 }
-
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/UnwrapParentheses.java b/rewrite-java/src/main/java/org/openrewrite/java/UnwrapParentheses.java
index 5e4e22eb821..08eff31fb25 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/UnwrapParentheses.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/UnwrapParentheses.java
@@ -66,4 +66,3 @@ public static boolean isUnwrappable(Cursor parensScope) {
         return true;
     }
 }
-
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureLexer.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureLexer.java
index 3c763810eed..b7de3acdab7 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureLexer.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureLexer.java
@@ -15,11 +15,11 @@
  */
 // Generated from java-escape by ANTLR 4.11.1
 package org.openrewrite.java.internal.grammar;
-import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.misc.*;
@@ -467,4 +467,4 @@ private boolean JavaLetterOrDigit_sempred(RuleContext _localctx, int predIndex)
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParser.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParser.java
index 13c6bdadf9d..914f7238853 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParser.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParser.java
@@ -15,14 +15,15 @@
  */
 // Generated from java-escape by ANTLR 4.11.1
 package org.openrewrite.java.internal.grammar;
+import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.misc.*;
 import org.antlr.v4.runtime.tree.*;
-import java.util.List;
-import java.util.Iterator;
+
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
 public class AnnotationSignatureParser extends Parser {
@@ -824,4 +825,4 @@ public final LiteralContext literal() throws RecognitionException {
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserBaseListener.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserBaseListener.java
index 29d7c56143d..36f30e848a4 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserBaseListener.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserBaseListener.java
@@ -172,4 +172,4 @@ public class AnnotationSignatureParserBaseListener implements AnnotationSignatur
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void visitErrorNode(ErrorNode node) { }
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserBaseVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserBaseVisitor.java
index 6f4bca456de..d3129a150d5 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserBaseVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserBaseVisitor.java
@@ -97,4 +97,4 @@ public class AnnotationSignatureParserBaseVisitor<T> extends AbstractParseTreeVi
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitLiteral(AnnotationSignatureParser.LiteralContext ctx) { return visitChildren(ctx); }
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserListener.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserListener.java
index 38e72c49319..f4cbf1c4dd4 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserListener.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserListener.java
@@ -122,4 +122,4 @@ public interface AnnotationSignatureParserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitLiteral(AnnotationSignatureParser.LiteralContext ctx);
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserVisitor.java
index c1c41e2d508..55c392a0208 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/AnnotationSignatureParserVisitor.java
@@ -85,4 +85,4 @@ public interface AnnotationSignatureParserVisitor<T> extends ParseTreeVisitor<T>
 	 * @return the visitor result
 	 */
 	T visitLiteral(AnnotationSignatureParser.LiteralContext ctx);
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureLexer.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureLexer.java
index 6f8da896fb9..3fc43612a44 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureLexer.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureLexer.java
@@ -225,4 +225,4 @@ private boolean JavaLetterOrDigit_sempred(RuleContext _localctx, int predIndex)
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParser.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParser.java
index 5d75d62f0cb..679eba572eb 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParser.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParser.java
@@ -1161,7 +1161,8 @@ public final SimpleNamePatternContext simpleNamePattern() throws RecognitionExce
 		return _localctx;
 	}
 
-	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
+    @Override
+    public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 		switch (ruleIndex) {
 		case 6:
 			return targetTypePattern_sempred((TargetTypePatternContext)_localctx, predIndex);
@@ -1305,4 +1306,4 @@ private boolean formalTypePattern_sempred(FormalTypePatternContext _localctx, in
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserBaseListener.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserBaseListener.java
index 7e005f30489..b6805555f2e 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserBaseListener.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserBaseListener.java
@@ -172,4 +172,4 @@ public class MethodSignatureParserBaseListener implements MethodSignatureParserL
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void visitErrorNode(ErrorNode node) { }
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserBaseVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserBaseVisitor.java
index 90de6c7528a..e515ad6edd4 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserBaseVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserBaseVisitor.java
@@ -97,4 +97,4 @@ public class MethodSignatureParserBaseVisitor<T> extends AbstractParseTreeVisito
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitSimpleNamePattern(MethodSignatureParser.SimpleNamePatternContext ctx) { return visitChildren(ctx); }
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserListener.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserListener.java
index 2e05b1f5577..958faa7bcdb 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserListener.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserListener.java
@@ -122,4 +122,4 @@ public interface MethodSignatureParserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitSimpleNamePattern(MethodSignatureParser.SimpleNamePatternContext ctx);
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserVisitor.java
index 6d32b1e14ce..61f37d6ef83 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/MethodSignatureParserVisitor.java
@@ -85,4 +85,4 @@ public interface MethodSignatureParserVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitSimpleNamePattern(MethodSignatureParser.SimpleNamePatternContext ctx);
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterLexer.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterLexer.java
index 69013a9f57c..9eed4532351 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterLexer.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterLexer.java
@@ -15,11 +15,11 @@
  */
 // Generated from java-escape by ANTLR 4.11.1
 package org.openrewrite.java.internal.grammar;
-import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.misc.*;
@@ -251,4 +251,4 @@ private boolean JavaLetterOrDigit_sempred(RuleContext _localctx, int predIndex)
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParser.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParser.java
index addcc6932f4..ac2dcac7364 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParser.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParser.java
@@ -15,14 +15,15 @@
  */
 // Generated from java-escape by ANTLR 4.11.1
 package org.openrewrite.java.internal.grammar;
+import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.misc.*;
 import org.antlr.v4.runtime.tree.*;
-import java.util.List;
-import java.util.Iterator;
+
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
 public class TemplateParameterParser extends Parser {
@@ -694,4 +695,4 @@ public final MatcherNameContext matcherName() throws RecognitionException {
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserBaseListener.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserBaseListener.java
index 24e9aafc04f..5a8433717a0 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserBaseListener.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserBaseListener.java
@@ -160,4 +160,4 @@ public class TemplateParameterParserBaseListener implements TemplateParameterPar
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void visitErrorNode(ErrorNode node) { }
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserBaseVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserBaseVisitor.java
index 943c49b5060..181924cf6f5 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserBaseVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserBaseVisitor.java
@@ -90,4 +90,4 @@ public class TemplateParameterParserBaseVisitor<T> extends AbstractParseTreeVisi
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitMatcherName(TemplateParameterParser.MatcherNameContext ctx) { return visitChildren(ctx); }
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserListener.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserListener.java
index 67fd090979c..222e8b599e1 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserListener.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserListener.java
@@ -112,4 +112,4 @@ public interface TemplateParameterParserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitMatcherName(TemplateParameterParser.MatcherNameContext ctx);
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserVisitor.java
index 21205ed20ad..29eeab75d84 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/grammar/TemplateParameterParserVisitor.java
@@ -79,4 +79,4 @@ public interface TemplateParameterParserVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitMatcherName(TemplateParameterParser.MatcherNameContext ctx);
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/TemplateParameter.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/TemplateParameter.java
index 0767be26476..3f5a56d29f8 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/TemplateParameter.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/TemplateParameter.java
@@ -32,4 +32,3 @@ public class TemplateParameter implements Marker {
     @Nullable
     String name;
 }
-
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/CoordinateBuilder.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/CoordinateBuilder.java
index b8edc7ae5fd..61d31042cd4 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/CoordinateBuilder.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/CoordinateBuilder.java
@@ -55,6 +55,7 @@ public JavaCoordinates before() {
             return before(Space.Location.STATEMENT_PREFIX);
         }
 
+        @Override
         public JavaCoordinates replace() {
             return replace(Space.Location.STATEMENT_PREFIX);
         }
@@ -82,6 +83,7 @@ public static class Annotation extends Expression {
             super(tree);
         }
 
+        @Override
         public JavaCoordinates replace() {
             return replace(Space.Location.ANNOTATION_PREFIX);
         }
@@ -174,6 +176,7 @@ public Identifier(J.Identifier tree) {
             super(tree);
         }
 
+        @Override
         public JavaCoordinates replace() {
             return replace(Space.Location.IDENTIFIER_PREFIX);
         }
@@ -276,6 +279,7 @@ public static class Package extends Statement {
             super(tree);
         }
 
+        @Override
         public JavaCoordinates replace() {
             return replace(Space.Location.PACKAGE_PREFIX);
         }
@@ -300,6 +304,7 @@ public static class Yield extends Statement {
             super(tree);
         }
 
+        @Override
         public JavaCoordinates replace() {
             return replace(Space.Location.YIELD_PREFIX);
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java
index 1833eb248e7..6800bd5f2da 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/J.java
@@ -235,6 +235,7 @@ public <P> J acceptJava(JavaVisitor<P> v, P p) {
             return v.visitAnnotation(this, p);
         }
 
+        @Override
         @Transient
         public CoordinateBuilder.Annotation getCoordinates() {
             return new CoordinateBuilder.Annotation(this);
@@ -304,6 +305,7 @@ public <P> J acceptJava(JavaVisitor<P> v, P p) {
             return v.visitArrayAccess(this, p);
         }
 
+        @Override
         @Transient
         public CoordinateBuilder.Expression getCoordinates() {
             return new CoordinateBuilder.Expression(this);
@@ -711,6 +713,7 @@ public <P> J acceptJava(JavaVisitor<P> v, P p) {
             return v.visitBinary(this, p);
         }
 
+        @Override
         @Transient
         public CoordinateBuilder.Expression getCoordinates() {
             return new CoordinateBuilder.Expression(this);
@@ -838,6 +841,7 @@ public <P> J acceptJava(JavaVisitor<P> v, P p) {
             return v.visitBlock(this, p);
         }
 
+        @Override
         @Transient
         public CoordinateBuilder.Block getCoordinates() {
             return new CoordinateBuilder.Block(this);
@@ -1481,20 +1485,24 @@ public SourceFile withCharset(Charset charset) {
         JRightPadded<Package> packageDeclaration;
 
         @Nullable
+        @Override
         public Package getPackageDeclaration() {
             return packageDeclaration == null ? null : packageDeclaration.getElement();
         }
 
+        @Override
         public CompilationUnit withPackageDeclaration(Package packageDeclaration) {
             return getPadding().withPackageDeclaration(JRightPadded.withElement(this.packageDeclaration, packageDeclaration));
         }
 
         List<JRightPadded<Import>> imports;
 
+        @Override
         public List<Import> getImports() {
             return JRightPadded.getElements(imports);
         }
 
+        @Override
         public CompilationUnit withImports(List<Import> imports) {
             return getPadding().withImports(JRightPadded.withElements(this.imports, imports));
         }
@@ -1569,6 +1577,7 @@ public <P> TreeVisitor<?, PrintOutputCapture<P>> printer(Cursor cursor) {
             return new JavaPrinter<>();
         }
 
+        @Override
         @Transient
         public TypesInUse getTypesInUse() {
             TypesInUse cache;
@@ -1585,6 +1594,7 @@ public TypesInUse getTypesInUse() {
             return cache;
         }
 
+        @Override
         public Padding getPadding() {
             Padding p;
             if (this.padding == null) {
@@ -1687,10 +1697,12 @@ final class DoWhileLoop implements J, Loop {
 
         JRightPadded<Statement> body;
 
+        @Override
         public Statement getBody() {
             return body.getElement();
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public DoWhileLoop withBody(Statement body) {
             return getPadding().withBody(this.body.withElement(body));
@@ -2064,10 +2076,12 @@ final class ForEachLoop implements J, Loop {
 
         JRightPadded<Statement> body;
 
+        @Override
         public Statement getBody() {
             return body.getElement();
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public ForEachLoop withBody(Statement body) {
             return getPadding().withBody(this.body.withElement(body));
@@ -2231,10 +2245,12 @@ final class ForLoop implements J, Loop {
 
         JRightPadded<Statement> body;
 
+        @Override
         public Statement getBody() {
             return body.getElement();
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public ForLoop withBody(Statement body) {
             return getPadding().withBody(this.body.withElement(body));
@@ -2476,6 +2492,7 @@ public <P> J acceptJava(JavaVisitor<P> v, P p) {
             return v.visitIdentifier(this, p);
         }
 
+        @Override
         @Transient
         public CoordinateBuilder.Identifier getCoordinates() {
             return new CoordinateBuilder.Identifier(this);
@@ -3318,6 +3335,7 @@ public <P> J acceptJava(JavaVisitor<P> v, P p) {
             return v.visitLiteral(this, p);
         }
 
+        @Override
         @Transient
         public CoordinateBuilder.Expression getCoordinates() {
             return new CoordinateBuilder.Expression(this);
@@ -3651,6 +3669,7 @@ public MethodDeclaration withMethodType(@Nullable JavaType.Method type) {
             return new MethodDeclaration(id, prefix, markers, leadingAnnotations, modifiers, typeParameters, returnTypeExpression, name, parameters, throwz, body, defaultValue, type);
         }
 
+        @Override
         public JavaType getType() {
             return methodType == null ? null : methodType.getReturnType();
         }
@@ -4221,6 +4240,7 @@ public <P> J acceptJava(JavaVisitor<P> v, P p) {
             return v.visitNewArray(this, p);
         }
 
+        @Override
         @Transient
         public CoordinateBuilder.Expression getCoordinates() {
             return new CoordinateBuilder.Expression(this);
@@ -4417,6 +4437,7 @@ public JavaType getType() {
          * @return The constructor type.
          */
         @Nullable
+        @Override
         public JavaType.Method getMethodType() {
             return getConstructorType();
         }
@@ -4618,6 +4639,7 @@ public <P> J acceptJava(JavaVisitor<P> v, P p) {
             return v.visitPackage(this, p);
         }
 
+        @Override
         @Transient
         public CoordinateBuilder.Package getCoordinates() {
             return new CoordinateBuilder.Package(this);
@@ -5913,6 +5935,7 @@ public NamedVariable withInitializer(@Nullable Expression initializer) {
             @Getter
             JavaType.Variable variableType;
 
+            @Override
             public JavaType getType() {
                 return variableType != null ? variableType.getType() : null;
             }
@@ -6043,10 +6066,12 @@ final class WhileLoop implements J, Loop {
 
         JRightPadded<Statement> body;
 
+        @Override
         public Statement getBody() {
             return body.getElement();
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public WhileLoop withBody(Statement body) {
             return getPadding().withBody(this.body.withElement(body));
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaSourceFile.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaSourceFile.java
index 9320228d85c..548dee1410f 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaSourceFile.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaSourceFile.java
@@ -54,8 +54,10 @@ public interface JavaSourceFile extends J, SourceFile {
     /**
      * @return An absolute or relative file path.
      */
+    @Override
     Path getSourcePath();
 
+    @Override
     @SuppressWarnings("unchecked")
     JavaSourceFile withSourcePath(Path path);
 
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
index 1a90bef4444..4355021d5ba 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaType.java
@@ -438,6 +438,7 @@ public Class(@Nullable Integer managedReference, long flagsBitMap, String fullyQ
         Class() {
         }
 
+        @Override
         public List<FullyQualified> getAnnotations() {
             return annotations == null ? emptyList() : Arrays.asList(annotations);
         }
@@ -455,6 +456,7 @@ public Class withAnnotations(@Nullable List<FullyQualified> annotations) {
         @NonFinal
         FullyQualified[] interfaces;
 
+        @Override
         public List<FullyQualified> getInterfaces() {
             return interfaces == null ? emptyList() : Arrays.asList(interfaces);
         }
@@ -472,6 +474,7 @@ public Class withInterfaces(@Nullable List<FullyQualified> interfaces) {
         @NonFinal
         Variable[] members;
 
+        @Override
         public List<Variable> getMembers() {
             return members == null ? emptyList() : Arrays.asList(members);
         }
@@ -489,6 +492,7 @@ public Class withMembers(@Nullable List<Variable> members) {
         @NonFinal
         Method[] methods;
 
+        @Override
         public List<Method> getMethods() {
             return methods == null ? emptyList() : Arrays.asList(methods);
         }
@@ -709,6 +713,7 @@ public String getFullyQualifiedName() {
             return type.getFullyQualifiedName();
         }
 
+        @Override
         public FullyQualified withFullyQualifiedName(String fullyQualifiedName) {
             return type.withFullyQualifiedName(fullyQualifiedName);
         }
@@ -749,6 +754,7 @@ public List<Method> getMethods() {
         }
 
         @Nullable
+        @Override
         public FullyQualified getOwningClass() {
             return type.getOwningClass();
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/Javadoc.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/Javadoc.java
index f1815bc4f41..49709c37e1d 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/Javadoc.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/Javadoc.java
@@ -140,6 +140,7 @@ class DocComment implements Javadoc, Comment {
 
         String suffix;
 
+        @Override
         @SuppressWarnings("unchecked")
         public DocComment withSuffix(String suffix) {
             if (!suffix.equals(this.suffix)) {
@@ -309,6 +310,7 @@ public LineBreak withMargin(String margin) {
             return new LineBreak(this.id, margin, this.markers);
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public LineBreak withMarkers(Markers markers) {
             if (markers == this.markers) {
@@ -700,6 +702,7 @@ class Reference implements Javadoc {
         @Nullable
         Markers markers;
 
+        @Override
         public Markers getMarkers() {
             return markers == null ? Markers.EMPTY : markers;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/MethodCall.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/MethodCall.java
index 4036ece93b4..056d65ebd74 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/MethodCall.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/MethodCall.java
@@ -26,6 +26,7 @@
  */
 public interface MethodCall extends Expression {
     @Nullable
+    @Override
     JavaType getType();
 
     @Override
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/TextComment.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/TextComment.java
index b29882ad12b..e8756b69f8c 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/TextComment.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/TextComment.java
@@ -40,6 +40,7 @@ public TextComment withText(String text) {
 
     String suffix;
 
+    @Override
     @SuppressWarnings("unchecked")
     public TextComment withSuffix(String suffix) {
         if(!suffix.equals(this.suffix)) {
diff --git a/rewrite-java/src/test/java/org/openrewrite/java/internal/template/TypeParameterTest.java b/rewrite-java/src/test/java/org/openrewrite/java/internal/template/TypeParameterTest.java
index 5f514f959bf..b74b0f4a07b 100644
--- a/rewrite-java/src/test/java/org/openrewrite/java/internal/template/TypeParameterTest.java
+++ b/rewrite-java/src/test/java/org/openrewrite/java/internal/template/TypeParameterTest.java
@@ -100,4 +100,4 @@ void unbounded(String name) {
         assertThat(type).isInstanceOf(JavaType.Parameterized.class);
         assertThat(TypeUtils.toString(type)).isEqualTo(name);
     }
-}
\ No newline at end of file
+}
diff --git a/rewrite-java/src/test/java/org/openrewrite/java/style/ImportLayoutStyleTest.java b/rewrite-java/src/test/java/org/openrewrite/java/style/ImportLayoutStyleTest.java
index a012ada4684..ca19f3a4fd8 100644
--- a/rewrite-java/src/test/java/org/openrewrite/java/style/ImportLayoutStyleTest.java
+++ b/rewrite-java/src/test/java/org/openrewrite/java/style/ImportLayoutStyleTest.java
@@ -22,11 +22,7 @@
 import org.junit.jupiter.api.Test;
 import org.openrewrite.Issue;
 import org.openrewrite.config.DeclarativeNamedStyles;
-import org.openrewrite.java.tree.J;
-import org.openrewrite.java.tree.JLeftPadded;
-import org.openrewrite.java.tree.JRightPadded;
-import org.openrewrite.java.tree.Space;
-import org.openrewrite.java.tree.TypeTree;
+import org.openrewrite.java.tree.*;
 import org.openrewrite.marker.Markers;
 
 import java.io.IOException;
diff --git a/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java b/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java
index 5a420b4d31c..17b6db10408 100755
--- a/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java
+++ b/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java
@@ -17,8 +17,8 @@
 
 import org.antlr.v4.runtime.*;
 import org.intellij.lang.annotations.Language;
-import org.openrewrite.Parser;
 import org.openrewrite.*;
+import org.openrewrite.Parser;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.json.internal.JsonParserVisitor;
 import org.openrewrite.json.internal.grammar.JSON5Lexer;
diff --git a/rewrite-json/src/main/java/org/openrewrite/json/internal/JsonPrinter.java b/rewrite-json/src/main/java/org/openrewrite/json/internal/JsonPrinter.java
index 6fa48e97600..01c989ec2c2 100755
--- a/rewrite-json/src/main/java/org/openrewrite/json/internal/JsonPrinter.java
+++ b/rewrite-json/src/main/java/org/openrewrite/json/internal/JsonPrinter.java
@@ -92,6 +92,7 @@ public Json visitObject(Json.JsonObject obj, PrintOutputCapture<P> p) {
         return obj;
     }
 
+    @Override
     public Space visitSpace(Space space, PrintOutputCapture<P> p) {
         p.append(space.getWhitespace());
 
diff --git a/rewrite-json/src/main/java/org/openrewrite/json/internal/grammar/JsonPathParser.java b/rewrite-json/src/main/java/org/openrewrite/json/internal/grammar/JsonPathParser.java
index 6fffbf67de8..6cd4e424cb1 100644
--- a/rewrite-json/src/main/java/org/openrewrite/json/internal/grammar/JsonPathParser.java
+++ b/rewrite-json/src/main/java/org/openrewrite/json/internal/grammar/JsonPathParser.java
@@ -1509,7 +1509,8 @@ public final IndexesContext indexes() throws RecognitionException {
 		return _localctx;
 	}
 
-	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
+    @Override
+    public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 		switch (ruleIndex) {
 		case 7:
 			return binaryExpression_sempred((BinaryExpressionContext)_localctx, predIndex);
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/AddProperty.java b/rewrite-maven/src/main/java/org/openrewrite/maven/AddProperty.java
index 62c18f76154..c92f3823b4d 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/AddProperty.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/AddProperty.java
@@ -73,6 +73,7 @@ public String getDescription() {
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         final String keyToReplace = key.replace("${", "").replace("}", "");
         return new MavenIsoVisitor<ExecutionContext>() {
+            @Override
             public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
                 String parentValue = getResolutionResult().getPom().getRequested().getProperties().get(key);
                 if ((Boolean.TRUE.equals(trustParent) && (parentValue == null || value.equals(parentValue)))
@@ -99,4 +100,3 @@ public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
         };
     }
 }
-
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenParser.java b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenParser.java
index 3e3f48a6982..a5562c7df97 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenParser.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenParser.java
@@ -213,6 +213,7 @@ public Builder mavenConfig(@Nullable Path mavenConfig) {
             return this;
         }
 
+        @Override
         public MavenParser build() {
             return new MavenParser(activeProfiles, skipDependencyResolution);
         }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenPomDownloader.java b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenPomDownloader.java
index 8475936e21d..a4f96e9597f 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenPomDownloader.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenPomDownloader.java
@@ -894,6 +894,7 @@ public boolean isClientSideException() {
             return responseCode != 408 && responseCode != 425 && responseCode != 429;
         }
 
+        @Override
         public String getMessage() {
             return responseCode == null ?
                     requireNonNull(getCause()).getMessage() :
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ManagedDependency.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ManagedDependency.java
index 0e84ee98beb..ce729f86a4a 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ManagedDependency.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ManagedDependency.java
@@ -49,15 +49,18 @@ class Defined implements ManagedDependency {
 
         List<GroupArtifact> exclusions;
 
+        @Override
         public String getGroupId() {
             return requireNonNull(gav.getGroupId());
         }
 
+        @Override
         public String getArtifactId() {
             return gav.getArtifactId();
         }
 
         @Nullable
+        @Override
         public String getVersion() {
             return gav.getVersion();
         }
@@ -74,15 +77,18 @@ public Defined withVersion(String version) {
     class Imported implements ManagedDependency {
         GroupArtifactVersion gav;
 
+        @Override
         public String getGroupId() {
             return requireNonNull(gav.getGroupId());
         }
 
+        @Override
         public String getArtifactId() {
             return gav.getArtifactId();
         }
 
         @Nullable
+        @Override
         public String getVersion() {
             return gav.getVersion();
         }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Plugin.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Plugin.java
index dee987fe0d9..6fd4dd1271a 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Plugin.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Plugin.java
@@ -141,4 +141,3 @@ public <T> List<T> getConfigurationList(String path, Class<T> elementClass) {
         return MavenXmlMapper.readMapper().convertValue(current, new TypeReference<List<T>>() {});
     }
 }
-
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Version.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Version.java
index a3bfe21dadd..3c5253d8a69 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Version.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Version.java
@@ -198,14 +198,17 @@ public int compareTo(@Nullable Version.Item that) {
             return rel;
         }
 
+        @Override
         public boolean equals(Object obj) {
             return obj instanceof Version.Item && this.compareTo((Version.Item) obj) == 0;
         }
 
+        @Override
         public int hashCode() {
             return this.value.hashCode() + this.kind * 31;
         }
 
+        @Override
         public String toString() {
             return String.valueOf(this.value);
         }
@@ -277,6 +280,7 @@ public boolean next() {
             }
         }
 
+        @Override
         public String toString() {
             return String.valueOf(this.token);
         }
diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/cache/LocalMavenArtifactCacheTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/cache/LocalMavenArtifactCacheTest.java
index 3903bb5a055..1d17b070b46 100644
--- a/rewrite-maven/src/test/java/org/openrewrite/maven/cache/LocalMavenArtifactCacheTest.java
+++ b/rewrite-maven/src/test/java/org/openrewrite/maven/cache/LocalMavenArtifactCacheTest.java
@@ -90,4 +90,4 @@ private static ResolvedDependency findDependency() {
         List<ResolvedDependency> runtimeDependencies = mavenModel.getDependencies().get(Scope.Runtime);
         return runtimeDependencies.get(0);
     }
-}
\ No newline at end of file
+}
diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesIsoVisitor.java b/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesIsoVisitor.java
index 1f9755bda83..e13e00cdcce 100644
--- a/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesIsoVisitor.java
+++ b/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesIsoVisitor.java
@@ -24,6 +24,7 @@ public Properties.Comment visitComment(Properties.Comment comment, P p) {
         return (Properties.Comment) super.visitComment(comment, p);
     }
 
+    @Override
     public Properties.File visitFile(Properties.File file, P p) {
         return (Properties.File) super.visitFile(file, p);
     }
diff --git a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/internal/ProtoPrinter.java b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/internal/ProtoPrinter.java
index b9db8c14f6f..ce443a85f9f 100755
--- a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/internal/ProtoPrinter.java
+++ b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/internal/ProtoPrinter.java
@@ -312,6 +312,7 @@ public Proto visitSyntax(Proto.Syntax syntax, PrintOutputCapture<P> p) {
         return syntax;
     }
 
+    @Override
     public Space visitSpace(Space space, PrintOutputCapture<P> p) {
         p.append(space.getWhitespace());
         for (Comment comment : space.getComments()) {
diff --git a/rewrite-test/src/main/java/org/openrewrite/Issue.java b/rewrite-test/src/main/java/org/openrewrite/Issue.java
index de56e03ea66..421ac9bde40 100644
--- a/rewrite-test/src/main/java/org/openrewrite/Issue.java
+++ b/rewrite-test/src/main/java/org/openrewrite/Issue.java
@@ -15,11 +15,7 @@
  */
 package org.openrewrite;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Marks a test as related to a GitHub issue.
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/AddToTagVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/AddToTagVisitor.java
index f55ead990b6..b7645ca09a0 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/AddToTagVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/AddToTagVisitor.java
@@ -117,4 +117,3 @@ public static Xml.Tag addToTag(Xml.Tag parentScope, Xml.Tag parent, Xml.Tag newC
                 .visitNonNull(parentScope, null, parentCursor);
     }
 }
-
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java b/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java
index 5dabcf0f01b..8f810d3448a 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java
@@ -17,8 +17,8 @@
 
 import org.antlr.v4.runtime.*;
 import org.intellij.lang.annotations.Language;
-import org.openrewrite.Parser;
 import org.openrewrite.*;
+import org.openrewrite.Parser;
 import org.openrewrite.internal.EncodingDetectingInputStream;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.tree.ParseError;
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLLexer.java b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLLexer.java
index 98dc377582e..066e1a879e3 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLLexer.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLLexer.java
@@ -15,11 +15,11 @@
  */
 // Generated from java-escape by ANTLR 4.11.1
 package org.openrewrite.xml.internal.grammar;
-import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.misc.*;
@@ -407,4 +407,4 @@ public XMLLexer(CharStream input) {
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParser.java b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParser.java
index 1dc142c9d3a..fef0184a3a9 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParser.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParser.java
@@ -15,14 +15,15 @@
  */
 // Generated from java-escape by ANTLR 4.11.1
 package org.openrewrite.xml.internal.grammar;
+import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.*;
 import org.antlr.v4.runtime.misc.*;
 import org.antlr.v4.runtime.tree.*;
-import java.util.List;
-import java.util.Iterator;
+
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
 public class XMLParser extends Parser {
@@ -1469,4 +1470,4 @@ public final ChardataContext chardata() throws RecognitionException {
 			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserBaseListener.java b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserBaseListener.java
index fbad3585998..a3f3352c6e3 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserBaseListener.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserBaseListener.java
@@ -244,4 +244,4 @@ public class XMLParserBaseListener implements XMLParserListener {
 	 * <p>The default implementation does nothing.</p>
 	 */
 	@Override public void visitErrorNode(ErrorNode node) { }
-}
\ No newline at end of file
+}
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserBaseVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserBaseVisitor.java
index 9eef2181b2b..7e6cccb3cab 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserBaseVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserBaseVisitor.java
@@ -139,4 +139,4 @@ public class XMLParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> impleme
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitChardata(XMLParser.ChardataContext ctx) { return visitChildren(ctx); }
-}
\ No newline at end of file
+}
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserListener.java b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserListener.java
index 4eb0f38a714..1fd09914894 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserListener.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserListener.java
@@ -182,4 +182,4 @@ public interface XMLParserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	void exitChardata(XMLParser.ChardataContext ctx);
-}
\ No newline at end of file
+}
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserVisitor.java
index fa4ee1a7ec8..921f15980e9 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/grammar/XMLParserVisitor.java
@@ -121,4 +121,4 @@ public interface XMLParserVisitor<T> extends ParseTreeVisitor<T> {
 	 * @return the visitor result
 	 */
 	T visitChardata(XMLParser.ChardataContext ctx);
-}
\ No newline at end of file
+}
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/tree/Content.java b/rewrite-xml/src/main/java/org/openrewrite/xml/tree/Content.java
index 854a13f5c9c..6d28ac1b9db 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/tree/Content.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/tree/Content.java
@@ -17,5 +17,6 @@
 
 public interface Content extends Xml {
 
+    @Override
     String getPrefix();
 }
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/tree/Xml.java b/rewrite-xml/src/main/java/org/openrewrite/xml/tree/Xml.java
index a011482b551..e60c51e54d9 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/tree/Xml.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/tree/Xml.java
@@ -92,10 +92,12 @@ class Document implements Xml, SourceFile {
         @With
         String prefixUnsafe;
 
+        @Override
         public Document withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -180,10 +182,12 @@ class Prolog implements Xml {
 
         String prefixUnsafe;
 
+        @Override
         public Prolog withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -211,10 +215,12 @@ class XmlDecl implements Xml, Misc {
         UUID id;
         String prefixUnsafe;
 
+        @Override
         public XmlDecl withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -243,10 +249,12 @@ class ProcessingInstruction implements Xml, Content, Misc {
 
         String prefixUnsafe;
 
+        @Override
         public ProcessingInstruction withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -276,10 +284,12 @@ class Tag implements Xml, Content {
         @With
         String prefixUnsafe;
 
+        @Override
         public Tag withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -470,10 +480,12 @@ public static class Closing implements Xml {
 
             String prefixUnsafe;
 
+            @Override
             public Closing withPrefix(String prefix) {
                 return WithPrefix.onlyIfNotEqual(this, prefix);
             }
 
+            @Override
             public String getPrefix() {
                 return prefixUnsafe;
             }
@@ -507,10 +519,12 @@ class Attribute implements Xml {
 
         String prefixUnsafe;
 
+        @Override
         public Attribute withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -538,10 +552,12 @@ public enum Quote {
 
             String prefixUnsafe;
 
+            @Override
             public Value withPrefix(String prefix) {
                 return WithPrefix.onlyIfNotEqual(this, prefix);
             }
 
+            @Override
             public String getPrefix() {
                 return prefixUnsafe;
             }
@@ -579,10 +595,12 @@ class CharData implements Xml, Content {
 
         String prefixUnsafe;
 
+        @Override
         public CharData withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -617,10 +635,12 @@ class Comment implements Xml, Content, Misc {
 
         String prefixUnsafe;
 
+        @Override
         public Comment withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -648,10 +668,12 @@ class DocTypeDecl implements Xml, Misc {
 
         String prefixUnsafe;
 
+        @Override
         public DocTypeDecl withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -681,10 +703,12 @@ public static class ExternalSubsets implements Xml {
 
             String prefixUnsafe;
 
+            @Override
             public ExternalSubsets withPrefix(String prefix) {
                 return WithPrefix.onlyIfNotEqual(this, prefix);
             }
 
+            @Override
             public String getPrefix() {
                 return prefixUnsafe;
             }
@@ -714,10 +738,12 @@ class Element implements Xml {
 
         String prefixUnsafe;
 
+        @Override
         public Element withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -745,10 +771,12 @@ class Ident implements Xml {
 
         String prefixUnsafe;
 
+        @Override
         public Ident withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
@@ -777,10 +805,12 @@ class JspDirective implements Xml, Content {
         @With
         String prefixUnsafe;
 
+        @Override
         public JspDirective withPrefix(String prefix) {
             return WithPrefix.onlyIfNotEqual(this, prefix);
         }
 
+        @Override
         public String getPrefix() {
             return prefixUnsafe;
         }
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/AppendToSequenceVisitor.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/AppendToSequenceVisitor.java
index 8689f701d1d..19f5bd6894f 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/AppendToSequenceVisitor.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/AppendToSequenceVisitor.java
@@ -65,7 +65,7 @@ protected boolean checkExistingSequenceValues(final Yaml.Sequence seq, final Cur
                     .sorted()
                     .collect(Collectors.toList());
             if (this.matchExistingSequenceValuesInAnyOrder) {
-                List<String> sorted = new ArrayList<String>(this.existingSequenceValues);
+                List<String> sorted = new ArrayList<>(this.existingSequenceValues);
                 Collections.sort(sorted);
                 return values.equals(sorted);
             } else {
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/YamlPrinter.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/YamlPrinter.java
index a1feb571cda..1a5bcf2a700 100755
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/YamlPrinter.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/YamlPrinter.java
@@ -148,6 +148,7 @@ public Yaml visitScalar(Yaml.Scalar scalar, PrintOutputCapture<P> p) {
         return scalar;
     }
 
+    @Override
     public Yaml visitAnchor(Yaml.Anchor anchor, PrintOutputCapture<P> p) {
         visitMarkers(anchor.getMarkers(), p);
         p.append(anchor.getPrefix());
@@ -158,6 +159,7 @@ public Yaml visitAnchor(Yaml.Anchor anchor, PrintOutputCapture<P> p) {
         return anchor;
     }
 
+    @Override
     public Yaml visitAlias(Yaml.Alias alias, PrintOutputCapture<P> p) {
         beforeSyntax(alias, p);
         p.append("*");
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/grammar/JsonPathParser.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/grammar/JsonPathParser.java
index c1119477d35..b4682af2b6d 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/grammar/JsonPathParser.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/internal/grammar/JsonPathParser.java
@@ -1509,7 +1509,8 @@ public final IndexesContext indexes() throws RecognitionException {
 		return _localctx;
 	}
 
-	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
+    @Override
+    public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
 		switch (ruleIndex) {
 		case 7:
 			return binaryExpression_sempred((BinaryExpressionContext)_localctx, predIndex);
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/Yaml.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/Yaml.java
index 7b1f6dedd5a..c9dd6027661 100755
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/Yaml.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/Yaml.java
@@ -225,6 +225,7 @@ public Scalar copyPaste() {
             return new Scalar(randomId(), prefix, Markers.EMPTY, style, anchor, value);
         }
 
+        @Override
         public String toString() {
             return "Yaml.Scalar(" + value + ")";
         }
@@ -440,6 +441,7 @@ public Alias copyPaste() {
             return new Alias(randomId(), prefix, Markers.EMPTY, anchor);
         }
 
+        @Override
         public String toString() {
             return "Yaml.Alias(" + anchor + ")";
         }
@@ -474,6 +476,7 @@ public Anchor copyPaste() {
             return new Anchor(randomId(), prefix, postfix, Markers.EMPTY, key);
         }
 
+        @Override
         public String toString() {
             return "Yaml.Anchor(" + key + ")";
         }
@@ -483,8 +486,10 @@ interface Block extends Yaml {
         /**
          * @return A new deep copy of this block with different IDs.
          */
+        @Override
         Block copyPaste();
 
+        @Override
         Block withPrefix(String prefix);
     }
 }
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/YamlKey.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/YamlKey.java
index 26dbf9a26f9..cc0fc1a0ded 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/YamlKey.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/tree/YamlKey.java
@@ -20,7 +20,10 @@
  */
 public interface YamlKey extends Yaml {
     String getValue();
+
+    @Override
     YamlKey copyPaste();
 
+    @Override
     YamlKey withPrefix(String prefix);
 }