From ad91222a2869e7baba013394c80ea349822397e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Schn=C3=A9ider?= <jkschneider@gmail.com>
Date: Tue, 16 Jul 2024 22:28:19 +0000
Subject: [PATCH] refactor: Move `@Nullable` method annotations to the return
 type

Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.NullableOnMethodReturnType?organizationId=T3BlblJld3JpdGU%3D

Co-authored-by: Moderne <team@moderne.io>
---
 .../src/main/java/org/openrewrite/Cursor.java |  21 +--
 .../org/openrewrite/DeleteSourceFiles.java    |   4 +-
 .../org/openrewrite/ExecutionContext.java     |   4 +-
 .../java/org/openrewrite/FileAttributes.java  |   3 +-
 .../java/org/openrewrite/FindSourceFiles.java |   4 +-
 .../openrewrite/InMemoryExecutionContext.java |   6 +-
 .../src/main/java/org/openrewrite/Recipe.java |   3 +-
 .../main/java/org/openrewrite/RecipeRun.java  |   6 +-
 .../main/java/org/openrewrite/RenameFile.java |   4 +-
 .../src/main/java/org/openrewrite/Result.java |   3 +-
 .../org/openrewrite/SetFilePermissions.java   |   4 +-
 .../main/java/org/openrewrite/SourceFile.java |   3 +-
 .../src/main/java/org/openrewrite/Tree.java   |   6 +-
 .../java/org/openrewrite/TreeVisitor.java     |  21 +--
 .../main/java/org/openrewrite/Validated.java  |   9 +-
 .../org/openrewrite/config/CategoryTree.java  |  15 +-
 .../config/YamlResourceLoader.java            |   3 +-
 .../internal/InMemoryLargeSourceSet.java      |   3 +-
 .../org/openrewrite/internal/ListUtils.java   |   3 +-
 .../internal/RecipeIntrospectionUtils.java    |   3 +-
 .../openrewrite/internal/ReflectionUtils.java |   6 +-
 .../org/openrewrite/marker/GitProvenance.java |  36 ++--
 .../java/org/openrewrite/marker/Markup.java   |   6 +-
 .../marker/OperatingSystemProvenance.java     |   3 +-
 .../marker/ci/BuildEnvironment.java           |   4 +-
 .../remote/LocalRemoteArtifactCache.java      |   6 +-
 .../java/org/openrewrite/remote/Remote.java   |   3 +-
 .../remote/RemoteArtifactCache.java           |   3 +-
 .../scheduling/RecipeRunCycle.java            |   3 +-
 .../scheduling/WatchableExecutionContext.java |   6 +-
 .../org/openrewrite/semver/CaretRange.java    |   3 +-
 .../org/openrewrite/style/NamedStyles.java    |   6 +-
 .../org/openrewrite/table/RecipeRunStats.java |   3 +-
 .../openrewrite/trait/SimpleTraitMatcher.java |   3 +-
 .../tree/ParsingExecutionContextView.java     |   3 +-
 .../org/openrewrite/PreconditionsTest.java    |  12 +-
 .../gradle/DependencyUseStringNotation.java   |   6 +-
 .../gradle/DependencyVersionSelector.java     |   9 +-
 .../UpgradeTransitiveDependencyVersion.java   |   3 +-
 .../marker/GradleDependencyConfiguration.java |   6 +-
 .../gradle/marker/GradleProject.java          |   3 +-
 .../gradle/marker/GradleSettings.java         |   3 +-
 .../plugins/AddDevelocityGradlePlugin.java    |   3 +-
 .../MigrateGradleEnterpriseToDevelocity.java  |   6 +-
 .../DependencyStringNotationConverter.java    |   6 +-
 .../gradle/util/GradleWrapper.java            |   3 +-
 .../org/openrewrite/groovy/GroovyParser.java  |   3 +-
 .../openrewrite/groovy/GroovyTypeMapping.java |  15 +-
 .../format/MinimumViableSpacingVisitor.java   |   6 +-
 ...renthesesForLastArgumentLambdaVisitor.java |   6 +-
 .../java/org/openrewrite/groovy/tree/G.java   |  12 +-
 .../org/openrewrite/hcl/JsonPathMatcher.java  |  12 +-
 .../openrewrite/hcl/RandomizeIdVisitor.java   |   4 +-
 .../hcl/format/AttributeSpaceVisitor.java     |   6 +-
 .../hcl/format/BlankLinesVisitor.java         |   6 +-
 .../hcl/format/BracketsVisitor.java           |   7 +-
 .../openrewrite/hcl/format/SpacesVisitor.java |   6 +-
 .../hcl/format/TabsAndIndentsVisitor.java     |  12 +-
 .../hcl/internal/HclParserVisitor.java        |   3 +-
 .../hcl/internal/template/Substitutions.java  |   6 +-
 .../java/org/openrewrite/hcl/tree/Hcl.java    |  21 +--
 .../openrewrite/hcl/tree/HclContainer.java    |   3 +-
 .../openrewrite/hcl/tree/HclCoordinates.java  |   3 +-
 .../openrewrite/hcl/tree/HclLeftPadded.java   |   3 +-
 .../openrewrite/hcl/tree/HclRightPadded.java  |   3 +-
 .../ReloadableJava11JavadocVisitor.java       |   6 +-
 .../ReloadableJava11ParserVisitor.java        |   9 +-
 .../isolated/ReloadableJava11TypeMapping.java |  18 +-
 .../ReloadableJava17JavadocVisitor.java       |   6 +-
 .../ReloadableJava17ParserVisitor.java        |   9 +-
 .../isolated/ReloadableJava17TypeMapping.java |  18 +-
 .../ReloadableJava21JavadocVisitor.java       |   6 +-
 .../ReloadableJava21ParserVisitor.java        |   9 +-
 .../isolated/ReloadableJava21TypeMapping.java |  18 +-
 .../java/ReloadableJava8JavadocVisitor.java   |   6 +-
 .../java/ReloadableJava8ParserVisitor.java    |   9 +-
 .../java/ReloadableJava8TypeMapping.java      |  18 +-
 .../java/search/IsOrIsNotLikelyTestTest.java  |   4 +-
 .../java/AddOrUpdateAnnotationAttribute.java  |   3 +-
 .../org/openrewrite/java/ChangePackage.java   |   6 +-
 .../java/org/openrewrite/java/ChangeType.java |  13 +-
 .../org/openrewrite/java/InvertCondition.java |   3 +-
 .../org/openrewrite/java/JavaTypeVisitor.java |   6 +-
 .../java/JavaUnrestrictedClassLoader.java     |   6 +-
 .../org/openrewrite/java/JavaVisitor.java     |  12 +-
 .../org/openrewrite/java/JavadocVisitor.java  |   3 +-
 .../org/openrewrite/java/MethodMatcher.java   |   6 +-
 .../openrewrite/java/RandomizeIdVisitor.java  |   4 +-
 .../org/openrewrite/java/RenameVariable.java  |   9 +-
 .../ReplaceStringLiteralWithConstant.java     |   6 +-
 .../java/format/BlankLinesVisitor.java        |   3 +-
 .../format/MinimumViableSpacingVisitor.java   |   6 +-
 .../java/format/NormalizeFormatVisitor.java   |   6 +-
 .../format/NormalizeLineBreaksVisitor.java    |   3 +-
 .../format/NormalizeTabsOrSpacesVisitor.java  |   6 +-
 .../RemoveTrailingWhitespaceVisitor.java      |   6 +-
 .../java/format/SpacesVisitor.java            |   6 +-
 .../java/format/TabsAndIndentsVisitor.java    |  12 +-
 .../java/format/WrappingAndBracesVisitor.java |   6 +-
 .../internal/JavaReflectionTypeMapping.java   |   3 +-
 .../java/internal/JavaTypeCache.java          |   3 +-
 .../template/AnnotationTemplateGenerator.java |   4 +-
 .../BlockStatementTemplateGenerator.java      |   9 +-
 .../internal/template/PatternVariables.java   |   6 +-
 .../java/internal/template/Substitutions.java |   6 +-
 .../java/marker/JavaSourceSet.java            |   3 +-
 .../java/search/SemanticallyEqual.java        |   3 +-
 .../java/style/CheckstyleConfigLoader.java    |  50 ++---
 .../java/trait/VariableAccess.java            |   6 +-
 .../org/openrewrite/java/tree/Expression.java |   3 +-
 .../java/org/openrewrite/java/tree/J.java     | 171 ++++++------------
 .../org/openrewrite/java/tree/JContainer.java |   3 +-
 .../openrewrite/java/tree/JLeftPadded.java    |   3 +-
 .../openrewrite/java/tree/JRightPadded.java   |   3 +-
 .../java/tree/JavaCoordinates.java            |   3 +-
 .../org/openrewrite/java/tree/JavaType.java   |  30 +--
 .../org/openrewrite/java/tree/Javadoc.java    |  12 +-
 .../org/openrewrite/java/tree/MethodCall.java |   3 +-
 .../org/openrewrite/java/tree/TypeUtils.java  |  18 +-
 .../org/openrewrite/json/JsonPathMatcher.java |  12 +-
 .../json/internal/JsonParserVisitor.java      |   3 +-
 .../java/org/openrewrite/json/tree/Json.java  |   3 +-
 .../maven/AddDevelocityMavenExtension.java    |   3 +-
 .../maven/AddManagedDependency.java           |   6 +-
 .../maven/MavenExecutionContextView.java      |   9 +-
 .../org/openrewrite/maven/MavenSettings.java  |  24 +--
 .../org/openrewrite/maven/MavenVisitor.java   |  24 +--
 .../maven/RemoveDuplicateDependencies.java    |   6 +-
 .../RemoveRedundantDependencyVersions.java    |   3 +-
 .../openrewrite/maven/UpdateMavenModel.java   |   3 +-
 .../maven/UpgradeDependencyVersion.java       |  12 +-
 .../maven/cache/CompositeMavenPomCache.java   |  12 +-
 .../maven/cache/InMemoryMavenPomCache.java    |  12 +-
 .../maven/cache/LocalMavenArtifactCache.java  |   6 +-
 .../maven/cache/MavenArtifactCache.java       |  12 +-
 .../ReadOnlyLocalMavenArtifactCache.java      |   6 +-
 .../maven/cache/RocksdbMavenPomCache.java     |  12 +-
 .../maven/internal/MavenPomDownloader.java    |  21 +--
 .../openrewrite/maven/internal/RawPom.java    |   6 +-
 .../maven/internal/VersionRequirement.java    |   9 +-
 .../openrewrite/maven/tree/Dependency.java    |   6 +-
 .../tree/GraphvizResolutionEventListener.java |   3 +-
 .../maven/tree/ManagedDependency.java         |   6 +-
 .../maven/tree/MavenRepository.java           |   3 +-
 .../maven/tree/MavenResolutionResult.java     |   6 +-
 .../org/openrewrite/maven/tree/Plugin.java    |   6 +-
 .../java/org/openrewrite/maven/tree/Pom.java  |   6 +-
 .../maven/tree/ResolvedDependency.java        |   9 +-
 .../maven/tree/ResolvedManagedDependency.java |   3 +-
 .../openrewrite/maven/tree/ResolvedPom.java   |  15 +-
 .../org/openrewrite/maven/tree/Scope.java     |   8 +-
 .../utilities/MavenArtifactDownloader.java    |   3 +-
 .../properties/ChangePropertyValue.java       |   4 +-
 .../properties/PropertiesParser.java          |   3 +-
 .../properties/PropertiesVisitor.java         |   3 +-
 .../properties/tree/Properties.java           |   3 +-
 .../protobuf/internal/ProtoParserVisitor.java |   6 +-
 .../org/openrewrite/protobuf/tree/Proto.java  |  39 ++--
 .../protobuf/tree/ProtoContainer.java         |   3 +-
 .../protobuf/tree/ProtoLeftPadded.java        |   3 +-
 .../org/openrewrite/test/RewriteTest.java     |   3 +-
 .../org/openrewrite/xml/XPathMatcher.java     |   3 +-
 .../xml/format/LineBreaksVisitor.java         |   6 +-
 .../format/MinimumViableSpacingVisitor.java   |   6 +-
 .../xml/format/NormalizeFormatVisitor.java    |   6 +-
 .../format/NormalizeLineBreaksVisitor.java    |   7 +-
 .../format/NormalizeTabsOrSpacesVisitor.java  |   6 +-
 .../RemoveTrailingWhitespaceVisitor.java      |   6 +-
 .../xml/format/TabsAndIndentsVisitor.java     |   6 +-
 .../xml/internal/XmlParserVisitor.java        |   3 +-
 .../org/openrewrite/xml/search/FindTags.java  |   3 +-
 .../java/org/openrewrite/xml/tree/Xml.java    |   3 +-
 .../openrewrite/yaml/ChangePropertyValue.java |   4 +-
 .../org/openrewrite/yaml/JsonPathMatcher.java |  12 +-
 .../java/org/openrewrite/yaml/MergeYaml.java  |   3 +-
 .../yaml/format/AutoFormatVisitor.java        |   6 +-
 .../yaml/format/IndentsVisitor.java           |  12 +-
 .../format/MinimumViableSpacingVisitor.java   |   6 +-
 .../yaml/format/NormalizeFormatVisitor.java   |   6 +-
 .../format/NormalizeLineBreaksVisitor.java    |   6 +-
 .../java/org/openrewrite/yaml/tree/Yaml.java  |   3 +-
 181 files changed, 506 insertions(+), 980 deletions(-)

diff --git a/rewrite-core/src/main/java/org/openrewrite/Cursor.java b/rewrite-core/src/main/java/org/openrewrite/Cursor.java
index 4a110e14079..6dbfb6bec7c 100644
--- a/rewrite-core/src/main/java/org/openrewrite/Cursor.java
+++ b/rewrite-core/src/main/java/org/openrewrite/Cursor.java
@@ -160,8 +160,7 @@ public Object next() {
         }
     }
 
-    @Nullable
-    public <T> T firstEnclosing(Class<T> tClass) {
+    public <T> @Nullable T firstEnclosing(Class<T> tClass) {
         CursorIterator iter = new CursorIterator(this);
         while (iter.hasNext()) {
             Object value = iter.next();
@@ -214,8 +213,7 @@ public Cursor dropParentWhile(Predicate<Object> valuePredicate) {
         return cursor;
     }
 
-    @Nullable
-    public Cursor getParent(int levels) {
+    public @Nullable Cursor getParent(int levels) {
         Cursor cursor = this;
         for (int i = 0; i < levels && cursor != null; i++) {
             cursor = cursor.parent;
@@ -223,8 +221,7 @@ public Cursor getParent(int levels) {
         return cursor;
     }
 
-    @Nullable
-    public Cursor getParent() {
+    public @Nullable Cursor getParent() {
         return getParent(1);
     }
 
@@ -292,8 +289,7 @@ public <T> T computeMessageIfAbsent(String key, Function<String, ? extends T> ma
      * @param <T> The expected value of the message.
      * @return The closest message matching the provided key in the cursor stack, or <code>null</code> if none.
      */
-    @Nullable
-    public <T> T getNearestMessage(String key) {
+    public <T> @Nullable T getNearestMessage(String key) {
         @SuppressWarnings("unchecked") T t = messages == null ? null : (T) messages.get(key);
         return t == null && parent != null ? parent.getNearestMessage(key) : t;
     }
@@ -316,8 +312,7 @@ public <T> T getNearestMessage(String key, T defaultValue) {
      * @param <T> The expected value of the message.
      * @return The closest message matching the provided key in the cursor stack, or <code>null</code> if none.
      */
-    @Nullable
-    public <T> T pollNearestMessage(String key) {
+    public <T> @Nullable T pollNearestMessage(String key) {
         @SuppressWarnings("unchecked") T t = messages == null ? null : (T) messages.remove(key);
         return t == null && parent != null ? parent.pollNearestMessage(key) : t;
     }
@@ -329,8 +324,7 @@ public <T> T pollNearestMessage(String key) {
      * @param <T> The expected value of the message.
      * @return The message matching the provided key, or <code>null</code> if none.
      */
-    @Nullable
-    public <T> T getMessage(String key) {
+    public <T> @Nullable T getMessage(String key) {
         //noinspection unchecked
         return messages == null ? null : (T) messages.get(key);
     }
@@ -347,8 +341,7 @@ public <T> T getMessage(String key, T defaultValue) {
      * @param <T> The expected value of the message.
      * @return The message matching the provided key, or <code>null</code> if none.
      */
-    @Nullable
-    public <T> T pollMessage(String key) {
+    public <T> @Nullable T pollMessage(String key) {
         //noinspection unchecked
         return messages == null ? null : (T) messages.remove(key);
     }
diff --git a/rewrite-core/src/main/java/org/openrewrite/DeleteSourceFiles.java b/rewrite-core/src/main/java/org/openrewrite/DeleteSourceFiles.java
index 10ce9d27018..a836522ef6e 100644
--- a/rewrite-core/src/main/java/org/openrewrite/DeleteSourceFiles.java
+++ b/rewrite-core/src/main/java/org/openrewrite/DeleteSourceFiles.java
@@ -44,9 +44,9 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new TreeVisitor<Tree, ExecutionContext>() {
-            @Nullable
+
             @Override
-            public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
+            public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
                 if (tree instanceof SourceFile) {
                     SourceFile sourceFile = (SourceFile) tree;
                     Path sourcePath = sourceFile.getSourcePath();
diff --git a/rewrite-core/src/main/java/org/openrewrite/ExecutionContext.java b/rewrite-core/src/main/java/org/openrewrite/ExecutionContext.java
index 284b9ae6efd..c3823e4acb1 100644
--- a/rewrite-core/src/main/java/org/openrewrite/ExecutionContext.java
+++ b/rewrite-core/src/main/java/org/openrewrite/ExecutionContext.java
@@ -51,7 +51,7 @@ default Set<TreeObserver.Subscription> getObservers() {
 
     void putMessage(String key, @Nullable Object value);
 
-    @Nullable <T> T getMessage(String key);
+    <T> @Nullable T getMessage(String key);
 
     default <V, T> T computeMessage(String key, V value, Supplier<T> defaultValue, BiFunction<V, ? super T, ? extends T> remappingFunction) {
         T oldMessage = getMessage(key);
@@ -83,7 +83,7 @@ default <T> T getMessage(String key, @Nullable T defaultValue) {
         return t == null ? defaultValue : t;
     }
 
-    @Nullable <T> T pollMessage(String key);
+    <T> @Nullable T pollMessage(String key);
 
     @SuppressWarnings("unused")
     default <T> T pollMessage(String key, T defaultValue) {
diff --git a/rewrite-core/src/main/java/org/openrewrite/FileAttributes.java b/rewrite-core/src/main/java/org/openrewrite/FileAttributes.java
index cc0b7854b38..cfa5fd09de8 100644
--- a/rewrite-core/src/main/java/org/openrewrite/FileAttributes.java
+++ b/rewrite-core/src/main/java/org/openrewrite/FileAttributes.java
@@ -46,8 +46,7 @@ public class FileAttributes {
 
     long size;
 
-    @Nullable
-    public static FileAttributes fromPath(Path path) {
+    public static @Nullable FileAttributes fromPath(Path path) {
         if (Files.exists(path)) {
             try {
                 BasicFileAttributes basicFileAttributes = Files.readAttributes(path, BasicFileAttributes.class);
diff --git a/rewrite-core/src/main/java/org/openrewrite/FindSourceFiles.java b/rewrite-core/src/main/java/org/openrewrite/FindSourceFiles.java
index 82a040bc9d8..74faa8e09f8 100644
--- a/rewrite-core/src/main/java/org/openrewrite/FindSourceFiles.java
+++ b/rewrite-core/src/main/java/org/openrewrite/FindSourceFiles.java
@@ -50,9 +50,9 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new TreeVisitor<Tree, ExecutionContext>() {
-            @Nullable
+
             @Override
-            public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
+            public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
                 if (tree instanceof SourceFile) {
                     SourceFile sourceFile = (SourceFile) tree;
                     Path sourcePath = sourceFile.getSourcePath();
diff --git a/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java b/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java
index 49efd7381ff..edf5a76d60c 100644
--- a/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java
+++ b/rewrite-core/src/main/java/org/openrewrite/InMemoryExecutionContext.java
@@ -60,15 +60,13 @@ public void putMessage(String key, @Nullable Object value) {
     }
 
     @Override
-    @Nullable
-    public <T> T getMessage(String key) {
+    public <T> @Nullable T getMessage(String key) {
         //noinspection unchecked
         return (T) messages.get(key);
     }
 
     @Override
-    @Nullable
-    public <T> T pollMessage(String key) {
+    public <T> @Nullable T pollMessage(String key) {
         //noinspection unchecked
         return (T) messages.remove(key);
     }
diff --git a/rewrite-core/src/main/java/org/openrewrite/Recipe.java b/rewrite-core/src/main/java/org/openrewrite/Recipe.java
index d1993685dd1..19832599c33 100644
--- a/rewrite-core/src/main/java/org/openrewrite/Recipe.java
+++ b/rewrite-core/src/main/java/org/openrewrite/Recipe.java
@@ -198,8 +198,7 @@ public Set<String> getTags() {
     /**
      * @return An estimated effort were a developer to fix manually instead of using this recipe.
      */
-    @Nullable
-    public Duration getEstimatedEffortPerOccurrence() {
+    public @Nullable Duration getEstimatedEffortPerOccurrence() {
         return Duration.ofMinutes(5);
     }
 
diff --git a/rewrite-core/src/main/java/org/openrewrite/RecipeRun.java b/rewrite-core/src/main/java/org/openrewrite/RecipeRun.java
index 7a43ffe2881..675a925fcc8 100644
--- a/rewrite-core/src/main/java/org/openrewrite/RecipeRun.java
+++ b/rewrite-core/src/main/java/org/openrewrite/RecipeRun.java
@@ -42,8 +42,7 @@ public class RecipeRun {
     @With
     Map<DataTable<?>, List<?>> dataTables;
 
-    @Nullable
-    public DataTable<?> getDataTable(String name) {
+    public @Nullable DataTable<?> getDataTable(String name) {
         for (DataTable<?> dataTable : dataTables.keySet()) {
             if (dataTable.getName().equals(name)) {
                 return dataTable;
@@ -52,8 +51,7 @@ public DataTable<?> getDataTable(String name) {
         return null;
     }
 
-    @Nullable
-    public <E> List<E> getDataTableRows(String name) {
+    public <E> @Nullable List<E> getDataTableRows(String name) {
         for (Map.Entry<DataTable<?>, List<?>> dataTableAndRows : dataTables.entrySet()) {
             if (dataTableAndRows.getKey().getName().equals(name)) {
                 //noinspection unchecked
diff --git a/rewrite-core/src/main/java/org/openrewrite/RenameFile.java b/rewrite-core/src/main/java/org/openrewrite/RenameFile.java
index acb84e9f55c..4669895faed 100644
--- a/rewrite-core/src/main/java/org/openrewrite/RenameFile.java
+++ b/rewrite-core/src/main/java/org/openrewrite/RenameFile.java
@@ -48,9 +48,9 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new TreeVisitor<Tree, ExecutionContext>() {
-            @Nullable
+
             @Override
-            public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
+            public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
                 if (tree instanceof SourceFile) {
                     SourceFile sourceFile = (SourceFile) tree;
                     Path sourcePath = sourceFile.getSourcePath();
diff --git a/rewrite-core/src/main/java/org/openrewrite/Result.java b/rewrite-core/src/main/java/org/openrewrite/Result.java
index d868280b954..319b0c782c5 100755
--- a/rewrite-core/src/main/java/org/openrewrite/Result.java
+++ b/rewrite-core/src/main/java/org/openrewrite/Result.java
@@ -230,8 +230,7 @@ public String diff(@Nullable Path relativeTo, @Nullable PrintOutputCapture.Marke
         }
     }
 
-    @Nullable
-    public static String diff(String before, String after, Path path) {
+    public static @Nullable String diff(String before, String after, Path path) {
         String diff = null;
         try (InMemoryDiffEntry diffEntry = new InMemoryDiffEntry(
                 path,
diff --git a/rewrite-core/src/main/java/org/openrewrite/SetFilePermissions.java b/rewrite-core/src/main/java/org/openrewrite/SetFilePermissions.java
index c302deadde5..3a45862dd66 100644
--- a/rewrite-core/src/main/java/org/openrewrite/SetFilePermissions.java
+++ b/rewrite-core/src/main/java/org/openrewrite/SetFilePermissions.java
@@ -55,9 +55,9 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new TreeVisitor<Tree, ExecutionContext>() {
-            @Nullable
+
             @Override
-            public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
+            public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
                 if (tree instanceof SourceFile) {
                     SourceFile sourceFile = (SourceFile) tree;
                     Path sourcePath = sourceFile.getSourcePath();
diff --git a/rewrite-core/src/main/java/org/openrewrite/SourceFile.java b/rewrite-core/src/main/java/org/openrewrite/SourceFile.java
index 038052eb8ff..f367b58db6f 100644
--- a/rewrite-core/src/main/java/org/openrewrite/SourceFile.java
+++ b/rewrite-core/src/main/java/org/openrewrite/SourceFile.java
@@ -70,8 +70,7 @@ default boolean printEqualsInput(Parser.Input input, ExecutionContext ctx) {
 
     <T extends SourceFile> T withFileAttributes(@Nullable FileAttributes fileAttributes);
 
-    @Nullable
-    default <S extends Style> S getStyle(Class<S> style) {
+    default <S extends Style> @Nullable S getStyle(Class<S> style) {
         return NamedStyles.merge(style, getMarkers().findAll(NamedStyles.class));
     }
 
diff --git a/rewrite-core/src/main/java/org/openrewrite/Tree.java b/rewrite-core/src/main/java/org/openrewrite/Tree.java
index 2015ae8c4b7..ab5a22b7b3f 100644
--- a/rewrite-core/src/main/java/org/openrewrite/Tree.java
+++ b/rewrite-core/src/main/java/org/openrewrite/Tree.java
@@ -65,8 +65,7 @@ static UUID randomId() {
      * @param <P> visit context type
      * @return visitor result
      */
-    @Nullable
-    default <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
+    default <R extends Tree, P> @Nullable R accept(TreeVisitor<R, P> v, P p) {
         return v.defaultValue(this, p);
     }
 
@@ -123,8 +122,7 @@ default <T2 extends Tree> T2 cast() {
         return (T2) this;
     }
 
-    @Nullable
-    default <T2 extends Tree> T2 safeCast() {
+    default <T2 extends Tree> @Nullable T2 safeCast() {
         try {
             return cast();
         } catch (ClassCastException ignored) {
diff --git a/rewrite-core/src/main/java/org/openrewrite/TreeVisitor.java b/rewrite-core/src/main/java/org/openrewrite/TreeVisitor.java
index 59c1beb8b9e..5618f45993a 100644
--- a/rewrite-core/src/main/java/org/openrewrite/TreeVisitor.java
+++ b/rewrite-core/src/main/java/org/openrewrite/TreeVisitor.java
@@ -85,8 +85,7 @@ public void setCursor(@Nullable Cursor cursor) {
     /**
      * @return Describes the language type that this visitor applies to, e.g. java, xml, properties.
      */
-    @Nullable
-    public String getLanguage() {
+    public @Nullable String getLanguage() {
         return null;
     }
 
@@ -135,18 +134,15 @@ public final Cursor updateCursor(T currentValue) {
         return cursor;
     }
 
-    @Nullable
-    public T preVisit(T tree, P p) {
+    public @Nullable T preVisit(T tree, P p) {
         return defaultValue(tree, p);
     }
 
-    @Nullable
-    public T postVisit(T tree, P p) {
+    public @Nullable T postVisit(T tree, P p) {
         return defaultValue(tree, p);
     }
 
-    @Nullable
-    public T visit(@Nullable Tree tree, P p, Cursor parent) {
+    public @Nullable T visit(@Nullable Tree tree, P p, Cursor parent) {
         this.cursor = parent;
         return visit(tree, p);
     }
@@ -221,8 +217,7 @@ public P reduce(Tree tree, P p, Cursor parent) {
         return p;
     }
 
-    @Nullable
-    public T visit(@Nullable Tree tree, P p) {
+    public @Nullable T visit(@Nullable Tree tree, P p) {
         if (tree == null) {
             return defaultValue(null, p);
         }
@@ -305,8 +300,7 @@ public void visit(@Nullable List<? extends T> nodes, P p) {
     }
 
     @SuppressWarnings("unused")
-    @Nullable
-    public T defaultValue(@Nullable Tree tree, P p) {
+    public @Nullable T defaultValue(@Nullable Tree tree, P p) {
         //noinspection unchecked
         return (T) tree;
     }
@@ -318,8 +312,7 @@ protected final <T2 extends Tree> T2 visitAndCast(T2 t, P p, BiFunction<T2, P, T
     }
 
     @Incubating(since = "7.0.0")
-    @Nullable
-    protected final <T2 extends T> T2 visitAndCast(@Nullable Tree tree, P p) {
+    protected final <T2 extends T> @Nullable T2 visitAndCast(@Nullable Tree tree, P p) {
         //noinspection unchecked
         return (T2) visit(tree, p);
     }
diff --git a/rewrite-core/src/main/java/org/openrewrite/Validated.java b/rewrite-core/src/main/java/org/openrewrite/Validated.java
index ab420cff96f..15394b13b19 100644
--- a/rewrite-core/src/main/java/org/openrewrite/Validated.java
+++ b/rewrite-core/src/main/java/org/openrewrite/Validated.java
@@ -230,8 +230,7 @@ public String getProperty() {
         }
 
         @Override
-        @Nullable
-        public T getValue() {
+        public @Nullable T getValue() {
             return value;
         }
 
@@ -285,13 +284,11 @@ public String getProperty() {
             return property;
         }
 
-        @Nullable
-        public Object getInvalidValue() {
+        public @Nullable Object getInvalidValue() {
             return value;
         }
 
-        @Nullable
-        public Throwable getException() {
+        public @Nullable Throwable getException() {
             return exception;
         }
 
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 c591e9345f4..d8e0aa7c5e9 100644
--- a/rewrite-core/src/main/java/org/openrewrite/config/CategoryTree.java
+++ b/rewrite-core/src/main/java/org/openrewrite/config/CategoryTree.java
@@ -164,8 +164,7 @@ public Integer getRecipeCount() {
         return sum;
     }
 
-    @Nullable
-    public CategoryTree<G> getCategory(String subcategory) {
+    public @Nullable CategoryTree<G> getCategory(String subcategory) {
         String packageName = getDescriptor().getPackageName();
         synchronized (lock) {
             String[] split = subcategory.split("\\.", 2);
@@ -188,8 +187,7 @@ public CategoryTree<G> getCategory(String subcategory) {
         return null;
     }
 
-    @Nullable
-    public CategoryTree<G> getCategory(String... subcategories) {
+    public @Nullable CategoryTree<G> getCategory(String... subcategories) {
         CategoryTree<G> acc = this;
         for (String subcategory : subcategories) {
             if (acc == null) {
@@ -219,8 +217,7 @@ public CategoryTree<G> getCategoryOrThrow(String... subcategories) {
         return acc;
     }
 
-    @Nullable
-    public RecipeDescriptor getRecipe(String id) {
+    public @Nullable RecipeDescriptor getRecipe(String id) {
         if (id.contains(".")) {
             String[] split = id.split("\\.", 2);
             CategoryTree<G> subcategory = getCategory(split[0]);
@@ -236,8 +233,7 @@ public RecipeDescriptor getRecipe(String id) {
         return null;
     }
 
-    @Nullable
-    public G getRecipeGroup(String id) {
+    public @Nullable G getRecipeGroup(String id) {
         if (id.contains(".")) {
             String[] split = id.split("\\.", 2);
             CategoryTree<G> subcategory = getCategory(split[0]);
@@ -414,8 +410,7 @@ public Collection<CategoryTree<G>> getCategories(boolean omitCategoryRoots,
         }
     }
 
-    @Nullable
-    private CategoryTree<G> maybeAddCore(CategoryDescriptor parent) {
+    private @Nullable CategoryTree<G> maybeAddCore(CategoryDescriptor parent) {
         if (recipesByGroup.isEmpty()) {
             return null;
         }
diff --git a/rewrite-core/src/main/java/org/openrewrite/config/YamlResourceLoader.java b/rewrite-core/src/main/java/org/openrewrite/config/YamlResourceLoader.java
index f2b5a1cb0dc..5813ae9f3d3 100644
--- a/rewrite-core/src/main/java/org/openrewrite/config/YamlResourceLoader.java
+++ b/rewrite-core/src/main/java/org/openrewrite/config/YamlResourceLoader.java
@@ -87,8 +87,7 @@ private enum ResourceType {
             this.spec = spec;
         }
 
-        @Nullable
-        public static ResourceType fromSpec(@Nullable String spec) {
+        public static @Nullable ResourceType fromSpec(@Nullable String spec) {
             return Arrays.stream(values())
                     .filter(type -> type.getSpec().equals(spec))
                     .findAny()
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/InMemoryLargeSourceSet.java b/rewrite-core/src/main/java/org/openrewrite/internal/InMemoryLargeSourceSet.java
index 742f3e3ba09..07dea5eee39 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/InMemoryLargeSourceSet.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/InMemoryLargeSourceSet.java
@@ -128,9 +128,8 @@ public Changeset getChangeset() {
         return new InMemoryChangeset(changes);
     }
 
-    @Nullable
     @Override
-    public SourceFile getBefore(Path sourcePath) {
+    public @Nullable SourceFile getBefore(Path sourcePath) {
         List<SourceFile> sourceFiles = getInitialState().ls;
         for (SourceFile s : sourceFiles) {
             if (s.getSourcePath().equals(sourcePath)) {
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/ListUtils.java b/rewrite-core/src/main/java/org/openrewrite/internal/ListUtils.java
index 9e9f9543816..e8a47c4d6b6 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/ListUtils.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/ListUtils.java
@@ -319,8 +319,7 @@ public static <T> List<T> insertAll(@Nullable List<T> ls, int index, @Nullable L
         return newLs;
     }
 
-    @Nullable
-    public static <T> List<T> nullIfEmpty(@Nullable List<T> ls) {
+    public static <T> @Nullable List<T> nullIfEmpty(@Nullable List<T> ls) {
         return ls == null || ls.isEmpty() ? null : ls;
     }
 
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/RecipeIntrospectionUtils.java b/rewrite-core/src/main/java/org/openrewrite/internal/RecipeIntrospectionUtils.java
index a3cc7e156d3..f7b5e5023fc 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/RecipeIntrospectionUtils.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/RecipeIntrospectionUtils.java
@@ -87,8 +87,7 @@ public static Constructor<?> getPrimaryConstructor(Class<?> recipeClass) {
         }
     }
 
-    @Nullable
-    public static Constructor<?> getZeroArgsConstructor(Class<?> recipeClass) {
+    public static @Nullable Constructor<?> getZeroArgsConstructor(Class<?> recipeClass) {
         Constructor<?>[] constructors = recipeClass.getConstructors();
         for (Constructor<?> constructor : constructors) {
             if (constructor.getParameterCount() == 0) {
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/ReflectionUtils.java b/rewrite-core/src/main/java/org/openrewrite/internal/ReflectionUtils.java
index 420c86ec539..8056e60ff88 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/ReflectionUtils.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/ReflectionUtils.java
@@ -38,8 +38,7 @@ public class ReflectionUtils {
      */
     private static final Map<Class<?>, Method[]> declaredMethodsCache = new ConcurrentHashMap<>(256);
 
-    @Nullable
-    public static Method findMethod(Class<?> clazz, String name, Class<?>... paramTypes) {
+    public static @Nullable Method findMethod(Class<?> clazz, String name, Class<?>... paramTypes) {
         Class<?> searchType = clazz;
         while (searchType != null) {
             Method[] methods = (searchType.isInterface() ? searchType.getMethods() :
@@ -80,8 +79,7 @@ private static Method[] getDeclaredMethods(Class<?> clazz) {
         return result;
     }
 
-    @Nullable
-    private static List<Method> findConcreteMethodsOnInterfaces(Class<?> clazz) {
+    private static @Nullable List<Method> findConcreteMethodsOnInterfaces(Class<?> clazz) {
         List<Method> result = null;
         for (Class<?> ifc : clazz.getInterfaces()) {
             for (Method ifcMethod : ifc.getMethods()) {
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 6c933807068..345ed68ecef 100644
--- a/rewrite-core/src/main/java/org/openrewrite/marker/GitProvenance.java
+++ b/rewrite-core/src/main/java/org/openrewrite/marker/GitProvenance.java
@@ -74,8 +74,7 @@ public class GitProvenance implements Marker {
      * @param baseUrl the portion of the URL which precedes the organization
      * @return the portion of the git origin URL which corresponds to the organization the git repository is organized under
      */
-    @Nullable
-    public String getOrganizationName(String baseUrl) {
+    public @Nullable String getOrganizationName(String baseUrl) {
         if (origin == null) {
             return null;
         }
@@ -102,8 +101,7 @@ public String getOrganizationName(String baseUrl) {
      * which accepts a "baseUrl" parameter should be used instead
      */
     @Deprecated
-    @Nullable
-    public String getOrganizationName() {
+    public @Nullable String getOrganizationName() {
         if (origin == null) {
             return null;
         }
@@ -118,8 +116,7 @@ public String getOrganizationName() {
         }
     }
 
-    @Nullable
-    public String getRepositoryName() {
+    public @Nullable String getRepositoryName() {
         if (origin == null) {
             return null;
         }
@@ -137,9 +134,8 @@ public String getRepositoryName() {
      * @return A marker containing git provenance information.
      * @deprecated Use {@link #fromProjectDirectory(Path, BuildEnvironment) instead}.
      */
-    @Nullable
     @Deprecated
-    public static GitProvenance fromProjectDirectory(Path projectDir) {
+    public static @Nullable GitProvenance fromProjectDirectory(Path projectDir) {
         return fromProjectDirectory(projectDir, null);
     }
 
@@ -149,8 +145,7 @@ public static GitProvenance fromProjectDirectory(Path projectDir) {
      *                    determined from a {@link BuildEnvironment} marker if possible.
      * @return A marker containing git provenance information.
      */
-    @Nullable
-    public static GitProvenance fromProjectDirectory(Path projectDir, @Nullable BuildEnvironment environment) {
+    public static @Nullable GitProvenance fromProjectDirectory(Path projectDir, @Nullable BuildEnvironment environment) {
         if (environment != null) {
             if (environment instanceof JenkinsBuildEnvironment) {
                 JenkinsBuildEnvironment jenkinsBuildEnvironment = (JenkinsBuildEnvironment) environment;
@@ -191,8 +186,7 @@ private static void printRequireGitDirOrWorkTreeException(Exception e) {
         }
     }
 
-    @Nullable
-    private static GitProvenance fromGitConfig(Path projectDir) {
+    private static @Nullable GitProvenance fromGitConfig(Path projectDir) {
         String branch = null;
         try (Repository repository = new RepositoryBuilder().findGitDir(projectDir.toFile()).build()) {
             String changeset = getChangeset(repository);
@@ -217,8 +211,7 @@ private static GitProvenance fromGitConfig(Repository repository, @Nullable Stri
                 getCommitters(repository));
     }
 
-    @Nullable
-    static String resolveBranchFromGitConfig(Repository repository) {
+    static @Nullable String resolveBranchFromGitConfig(Repository repository) {
         String branch;
         try {
             try (Git git = Git.open(repository.getDirectory())) {
@@ -253,8 +246,7 @@ static String resolveBranchFromGitConfig(Repository repository) {
 
     }
 
-    @Nullable
-    private static String localBranchName(Repository repository, @Nullable String remoteBranch) throws IOException, GitAPIException {
+    private static @Nullable String localBranchName(Repository repository, @Nullable String remoteBranch) throws IOException, GitAPIException {
         if (remoteBranch == null) {
             return null;
         } else if (remoteBranch.startsWith("remotes/")) {
@@ -276,8 +268,7 @@ private static String localBranchName(Repository repository, @Nullable String re
         return branch;
     }
 
-    @Nullable
-    private static String getOrigin(Repository repository) {
+    private static @Nullable String getOrigin(Repository repository) {
         Config storedConfig = repository.getConfig();
         String url = storedConfig.getString("remote", "origin", "url");
         if (url == null) {
@@ -289,8 +280,7 @@ private static String getOrigin(Repository repository) {
         return url;
     }
 
-    @Nullable
-    private static AutoCRLF getAutocrlf(Repository repository) {
+    private static @Nullable AutoCRLF getAutocrlf(Repository repository) {
         WorkingTreeOptions opt = repository.getConfig().get(WorkingTreeOptions.KEY);
         switch (opt.getAutoCRLF()) {
             case FALSE:
@@ -304,8 +294,7 @@ private static AutoCRLF getAutocrlf(Repository repository) {
         }
     }
 
-    @Nullable
-    private static EOL getEOF(Repository repository) {
+    private static @Nullable EOL getEOF(Repository repository) {
         WorkingTreeOptions opt = repository.getConfig().get(WorkingTreeOptions.KEY);
         switch (opt.getEOL()) {
             case CRLF:
@@ -345,8 +334,7 @@ private static List<Committer> getCommitters(Repository repository) {
         }
     }
 
-    @Nullable
-    private static String getChangeset(Repository repository) throws IOException {
+    private static @Nullable String getChangeset(Repository repository) throws IOException {
         ObjectId head = repository.resolve(Constants.HEAD);
         if (head == null) {
             return null;
diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/Markup.java b/rewrite-core/src/main/java/org/openrewrite/marker/Markup.java
index b05cd7fbd9a..2c3f8f002a7 100644
--- a/rewrite-core/src/main/java/org/openrewrite/marker/Markup.java
+++ b/rewrite-core/src/main/java/org/openrewrite/marker/Markup.java
@@ -156,9 +156,8 @@ public String getMessage() {
             return message;
         }
 
-        @Nullable
         @Override
-        public String getDetail() {
+        public @Nullable String getDetail() {
             return detail;
         }
     }
@@ -181,9 +180,8 @@ public String getMessage() {
             return message;
         }
 
-        @Nullable
         @Override
-        public String getDetail() {
+        public @Nullable String getDetail() {
             return detail;
         }
     }
diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/OperatingSystemProvenance.java b/rewrite-core/src/main/java/org/openrewrite/marker/OperatingSystemProvenance.java
index a4fbf81ef99..1dd205b9e30 100644
--- a/rewrite-core/src/main/java/org/openrewrite/marker/OperatingSystemProvenance.java
+++ b/rewrite-core/src/main/java/org/openrewrite/marker/OperatingSystemProvenance.java
@@ -231,8 +231,7 @@ public enum EOL {
     /**
      * Locates the given executable in the system path. Returns null if not found.
      */
-    @Nullable
-    public File findInPath(String name) {
+    public @Nullable File findInPath(String name) {
         String exeName = getExecutableName(name);
         if (exeName.contains(File.separator)) {
             File candidate = new File(exeName);
diff --git a/rewrite-core/src/main/java/org/openrewrite/marker/ci/BuildEnvironment.java b/rewrite-core/src/main/java/org/openrewrite/marker/ci/BuildEnvironment.java
index 3e2269301f3..4fdf01406f2 100644
--- a/rewrite-core/src/main/java/org/openrewrite/marker/ci/BuildEnvironment.java
+++ b/rewrite-core/src/main/java/org/openrewrite/marker/ci/BuildEnvironment.java
@@ -22,8 +22,8 @@
 import java.util.function.UnaryOperator;
 
 public interface BuildEnvironment extends Marker {
-    @Nullable
-    static BuildEnvironment build(UnaryOperator<String> environment) {
+
+    static @Nullable BuildEnvironment build(UnaryOperator<String> environment) {
         if (environment.apply("BITBUCKET_COMMIT") != null) {
             return BitbucketBuildEnvironment.build(environment);
         }
diff --git a/rewrite-core/src/main/java/org/openrewrite/remote/LocalRemoteArtifactCache.java b/rewrite-core/src/main/java/org/openrewrite/remote/LocalRemoteArtifactCache.java
index 543cd7f07e6..88804f09832 100644
--- a/rewrite-core/src/main/java/org/openrewrite/remote/LocalRemoteArtifactCache.java
+++ b/rewrite-core/src/main/java/org/openrewrite/remote/LocalRemoteArtifactCache.java
@@ -39,15 +39,13 @@ public LocalRemoteArtifactCache(Path cacheDir) {
     }
 
     @Override
-    @Nullable
-    public Path get(URI uri) {
+    public @Nullable Path get(URI uri) {
         Path resolved = cacheDir.resolve(hashUri(uri));
         return Files.exists(resolved) ? resolved : null;
     }
 
     @Override
-    @Nullable
-    public Path put(URI uri, InputStream artifactInputStream, Consumer<Throwable> onError) {
+    public @Nullable Path put(URI uri, InputStream artifactInputStream, Consumer<Throwable> onError) {
         try {
             Path artifact = cacheDir.resolve(UUID.randomUUID() + ".tmp");
             try (InputStream is = artifactInputStream) {
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 9febfb17582..53b7a496ad1 100644
--- a/rewrite-core/src/main/java/org/openrewrite/remote/Remote.java
+++ b/rewrite-core/src/main/java/org/openrewrite/remote/Remote.java
@@ -55,9 +55,8 @@ public interface Remote extends SourceFile {
 
     <R extends Remote> R withDescription(String description);
 
-    @Nullable
     @Override
-    default Checksum getChecksum() {
+    default @Nullable Checksum getChecksum() {
         return null;
     }
 
diff --git a/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArtifactCache.java b/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArtifactCache.java
index c25affdd867..5c9ee55dfd3 100644
--- a/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArtifactCache.java
+++ b/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArtifactCache.java
@@ -31,8 +31,7 @@ public interface RemoteArtifactCache {
     @Nullable
     Path put(URI uri, InputStream is, Consumer<Throwable> onError);
 
-    @Nullable
-    default Path compute(URI uri, Callable<@Nullable InputStream> artifactStream, Consumer<Throwable> onError) {
+    default @Nullable Path compute(URI uri, Callable<@Nullable InputStream> artifactStream, Consumer<Throwable> onError) {
         Path artifact = get(uri);
         if (artifact == null) {
             try {
diff --git a/rewrite-core/src/main/java/org/openrewrite/scheduling/RecipeRunCycle.java b/rewrite-core/src/main/java/org/openrewrite/scheduling/RecipeRunCycle.java
index 840164fe861..d08b85bb17d 100644
--- a/rewrite-core/src/main/java/org/openrewrite/scheduling/RecipeRunCycle.java
+++ b/rewrite-core/src/main/java/org/openrewrite/scheduling/RecipeRunCycle.java
@@ -237,8 +237,7 @@ private void recordSourceFileResult(@Nullable String beforePath, @Nullable Strin
         recordSourceFileResult(beforePath, afterPath, recipeStack.subList(0, recipeStack.size() - 1), effortSeconds, ctx);
     }
 
-    @Nullable
-    private SourceFile handleError(Recipe recipe, SourceFile sourceFile, @Nullable SourceFile after,
+    private @Nullable SourceFile handleError(Recipe recipe, SourceFile sourceFile, @Nullable SourceFile after,
                                    Throwable t) {
         ctx.getOnError().accept(t);
 
diff --git a/rewrite-core/src/main/java/org/openrewrite/scheduling/WatchableExecutionContext.java b/rewrite-core/src/main/java/org/openrewrite/scheduling/WatchableExecutionContext.java
index aba03bed03c..dc798d4420a 100644
--- a/rewrite-core/src/main/java/org/openrewrite/scheduling/WatchableExecutionContext.java
+++ b/rewrite-core/src/main/java/org/openrewrite/scheduling/WatchableExecutionContext.java
@@ -45,15 +45,13 @@ public void putCycle(RecipeRunCycle<?> cycle) {
         delegate.putMessage(CURRENT_CYCLE, cycle);
     }
 
-    @Nullable
     @Override
-    public <T> T getMessage(String key) {
+    public <T> @Nullable T getMessage(String key) {
         return delegate.getMessage(key);
     }
 
-    @Nullable
     @Override
-    public <T> T pollMessage(String key) {
+    public <T> @Nullable T pollMessage(String key) {
         return delegate.pollMessage(key);
     }
 
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/CaretRange.java b/rewrite-core/src/main/java/org/openrewrite/semver/CaretRange.java
index 83a2e09791a..58cdd690477 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/CaretRange.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/CaretRange.java
@@ -93,8 +93,7 @@ public static Validated<CaretRange> build(String pattern, @Nullable String metad
         return Validated.valid("caretRange", new CaretRange(lower, upper, metadataPattern));
     }
 
-    @Nullable
-    private static String normalizeWildcard(@Nullable String part) {
+    private static @Nullable String normalizeWildcard(@Nullable String part) {
         return "*".equals(part) || "x".equals(part) || "X".equals(part) ? null : part;
     }
 }
diff --git a/rewrite-core/src/main/java/org/openrewrite/style/NamedStyles.java b/rewrite-core/src/main/java/org/openrewrite/style/NamedStyles.java
index 2bc13939ab5..8ac29fadbe6 100644
--- a/rewrite-core/src/main/java/org/openrewrite/style/NamedStyles.java
+++ b/rewrite-core/src/main/java/org/openrewrite/style/NamedStyles.java
@@ -54,8 +54,7 @@ public class NamedStyles implements Marker {
     Collection<Style> styles;
 
     @SuppressWarnings("unchecked")
-    @Nullable
-    public static <S extends Style> S merge(Class<S> styleClass,
+    public static <S extends Style> @Nullable S merge(Class<S> styleClass,
                                             Iterable<? extends NamedStyles> namedStyles) {
         S merged = null;
         for (NamedStyles namedStyle : namedStyles) {
@@ -82,8 +81,7 @@ public static <S extends Style> S merge(Class<S> styleClass,
      * @param styles The styles to be merged. Styles earlier in the list take precedence over styles later in the list.
      * @return A single merged style with the aggregate configuration of all inputs. null if the list is empty.
      */
-    @Nullable
-    public static NamedStyles merge(List<NamedStyles> styles) {
+    public static @Nullable NamedStyles merge(List<NamedStyles> styles) {
         if (styles.isEmpty()) {
             return null;
         } else if (styles.size() == 1) {
diff --git a/rewrite-core/src/main/java/org/openrewrite/table/RecipeRunStats.java b/rewrite-core/src/main/java/org/openrewrite/table/RecipeRunStats.java
index c70c4b413f7..ddde328a2b9 100644
--- a/rewrite-core/src/main/java/org/openrewrite/table/RecipeRunStats.java
+++ b/rewrite-core/src/main/java/org/openrewrite/table/RecipeRunStats.java
@@ -59,8 +59,7 @@ public void recordScan(Recipe recipe, Callable<SourceFile> scan) throws Exceptio
                 .recordCallable(scan);
     }
 
-    @Nullable
-    public SourceFile recordEdit(Recipe recipe, Callable<SourceFile> edit) throws Exception {
+    public @Nullable SourceFile recordEdit(Recipe recipe, Callable<SourceFile> edit) throws Exception {
         return Timer.builder("rewrite.recipe.edit")
                 .tag("name", recipe.getName())
                 .publishPercentiles(0.99)
diff --git a/rewrite-core/src/main/java/org/openrewrite/trait/SimpleTraitMatcher.java b/rewrite-core/src/main/java/org/openrewrite/trait/SimpleTraitMatcher.java
index 5db1264b96e..5c6f6426372 100644
--- a/rewrite-core/src/main/java/org/openrewrite/trait/SimpleTraitMatcher.java
+++ b/rewrite-core/src/main/java/org/openrewrite/trait/SimpleTraitMatcher.java
@@ -82,6 +82,5 @@ public Tree preVisit(Tree tree, P p) {
         };
     }
 
-    @Nullable
-    protected abstract U test(Cursor cursor);
+    protected abstract @Nullable U test(Cursor cursor);
 }
diff --git a/rewrite-core/src/main/java/org/openrewrite/tree/ParsingExecutionContextView.java b/rewrite-core/src/main/java/org/openrewrite/tree/ParsingExecutionContextView.java
index 9bc680ada98..673ed760b19 100644
--- a/rewrite-core/src/main/java/org/openrewrite/tree/ParsingExecutionContextView.java
+++ b/rewrite-core/src/main/java/org/openrewrite/tree/ParsingExecutionContextView.java
@@ -51,8 +51,7 @@ public ParsingExecutionContextView setCharset(@Nullable Charset charset) {
         return this;
     }
 
-    @Nullable
-    public Charset getCharset() {
+    public @Nullable Charset getCharset() {
         return getMessage(CHARSET);
     }
 }
diff --git a/rewrite-core/src/test/java/org/openrewrite/PreconditionsTest.java b/rewrite-core/src/test/java/org/openrewrite/PreconditionsTest.java
index 2436a87e681..b105f820a2d 100644
--- a/rewrite-core/src/test/java/org/openrewrite/PreconditionsTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/PreconditionsTest.java
@@ -100,9 +100,9 @@ void orOtherSourceType() {
         rewriteRun(
           spec -> spec.recipe(toRecipe(() -> Preconditions.check(Preconditions.or(
               new PlainTextVisitor<>() {
-                  @Nullable
+
                   @Override
-                  public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
+                  public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
                       return tree != null && ((PlainText) tree).getText().contains("foo") ? SearchResult.found(tree) : tree;
                   }
               }),
@@ -122,9 +122,9 @@ void andOtherSourceType() {
         rewriteRun(
           spec -> spec.recipe(toRecipe(() -> Preconditions.check(Preconditions.and(
               new PlainTextVisitor<>() {
-                  @Nullable
+
                   @Override
-                  public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
+                  public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
                       return tree != null && ((PlainText) tree).getText().contains("foo") ? SearchResult.found(tree) : tree;
                   }
               }),
@@ -144,9 +144,9 @@ void notOtherSourceType() {
         rewriteRun(
           spec -> spec.recipe(toRecipe(() -> Preconditions.check(Preconditions.not(
               new PlainTextVisitor<>() {
-                  @Nullable
+
                   @Override
-                  public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
+                  public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
                       return tree != null && ((PlainText) tree).getText().contains("foo") ? SearchResult.found(tree) : tree;
                   }
               }),
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java
index f7a3565efa6..3cf3120f06b 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java
@@ -118,8 +118,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
                 return m;
             }
 
-            @Nullable
-            private J.Literal toLiteral(Space prefix, Markers markers, Map<String, Expression> mapNotation) {
+            private @Nullable J.Literal toLiteral(Space prefix, Markers markers, Map<String, Expression> mapNotation) {
                 if (mapNotation.containsKey("group") && mapNotation.containsKey("name")) {
                     String stringNotation = "";
 
@@ -148,8 +147,7 @@ private J.Literal toLiteral(Space prefix, Markers markers, Map<String, Expressio
                 return null;
             }
 
-            @Nullable
-            private String coerceToStringNotation(Expression expression) {
+            private @Nullable String coerceToStringNotation(Expression expression) {
                 if (expression instanceof J.Literal) {
                     return (String) ((J.Literal) expression).getValue();
                 } else if (expression instanceof J.Identifier) {
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyVersionSelector.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyVersionSelector.java
index 3467c457da2..910bb9e33f5 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyVersionSelector.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyVersionSelector.java
@@ -64,8 +64,7 @@ public class DependencyVersionSelector {
      * @return The selected version, if any.
      * @throws MavenDownloadingException If there is a problem downloading metadata for the dependency.
      */
-    @Nullable
-    public String select(GroupArtifact ga,
+    public @Nullable String select(GroupArtifact ga,
                          String configuration,
                          @Nullable String version,
                          @Nullable String versionPattern,
@@ -92,8 +91,7 @@ public String select(GroupArtifact ga,
      * @return The selected version, if any.
      * @throws MavenDownloadingException If there is a problem downloading metadata for the dependency.
      */
-    @Nullable
-    public String select(ResolvedGroupArtifactVersion gav,
+    public @Nullable String select(ResolvedGroupArtifactVersion gav,
                          String configuration,
                          @Nullable String version,
                          @Nullable String versionPattern,
@@ -114,8 +112,7 @@ public String select(ResolvedGroupArtifactVersion gav,
      * @return The selected version, if any.
      * @throws MavenDownloadingException If there is a problem downloading metadata for the dependency.
      */
-    @Nullable
-    public String select(GroupArtifactVersion gav,
+    public @Nullable String select(GroupArtifactVersion gav,
                          @Nullable String configuration,
                          @Nullable String version,
                          @Nullable String versionPattern,
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeTransitiveDependencyVersion.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeTransitiveDependencyVersion.java
index b28cab06b92..a462f839aac 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeTransitiveDependencyVersion.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeTransitiveDependencyVersion.java
@@ -270,8 +270,7 @@ private GradleProject updatedModel(GradleProject gradleProject, Map<GroupArtifac
              *     implementation("g:a:v") { }
              * }
              */
-            @Nullable
-            private GradleDependencyConfiguration constraintConfiguration(GradleDependencyConfiguration config) {
+            private @Nullable GradleDependencyConfiguration constraintConfiguration(GradleDependencyConfiguration config) {
                 String constraintConfigName = config.getName();
                 switch (constraintConfigName) {
                     case "compileClasspath":
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleDependencyConfiguration.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleDependencyConfiguration.java
index c1f0886dae3..43c08122e98 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleDependencyConfiguration.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleDependencyConfiguration.java
@@ -109,8 +109,7 @@ public List<GradleDependencyConfiguration> allExtendsFrom() {
         return new ArrayList<>(result);
     }
 
-    @Nullable
-    public Dependency findRequestedDependency(String groupId, String artifactId) {
+    public @Nullable Dependency findRequestedDependency(String groupId, String artifactId) {
         for (Dependency d : requested) {
             if (StringUtils.matchesGlob(d.getGav().getGroupId(), groupId) &&
                 StringUtils.matchesGlob(d.getGav().getArtifactId(), artifactId)) {
@@ -120,8 +119,7 @@ public Dependency findRequestedDependency(String groupId, String artifactId) {
         return null;
     }
 
-    @Nullable
-    public ResolvedDependency findResolvedDependency(String groupId, String artifactId) {
+    public @Nullable ResolvedDependency findResolvedDependency(String groupId, String artifactId) {
         for (ResolvedDependency d : directResolved) {
             ResolvedDependency dependency = d.findDependency(groupId, artifactId);
             if (dependency != null) {
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleProject.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleProject.java
index 3fdff204b06..a5d02e1d57e 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleProject.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleProject.java
@@ -57,8 +57,7 @@ public List<MavenRepository> getMavenPluginRepositories() {
         return mavenPluginRepositories == null ? Collections.emptyList() : mavenPluginRepositories;
     }
 
-    @Nullable
-    public GradleDependencyConfiguration getConfiguration(String name) {
+    public @Nullable GradleDependencyConfiguration getConfiguration(String name) {
         return nameToConfiguration.get(name);
     }
 
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleSettings.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleSettings.java
index b6296cf41e0..13eb5a62dc2 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleSettings.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleSettings.java
@@ -36,8 +36,7 @@ public class GradleSettings implements Marker, Serializable {
     List<GradlePluginDescriptor> plugins;
     Map<String, FeaturePreview> featurePreviews;
 
-    @Nullable
-    public Boolean isFeatureEnabled(String name) {
+    public @Nullable Boolean isFeatureEnabled(String name) {
         // Unclear how enabled status can be determined in latest gradle APIs
         return null;
     }
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePlugin.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePlugin.java
index 96e304352c9..25e3c007547 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePlugin.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePlugin.java
@@ -245,8 +245,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Atomi
         return found.get();
     }
 
-    @Nullable
-    private J.MethodInvocation gradleEnterpriseDsl(String newVersion, VersionComparator versionComparator, String indent, ExecutionContext ctx) {
+    private @Nullable J.MethodInvocation gradleEnterpriseDsl(String newVersion, VersionComparator versionComparator, String indent, ExecutionContext ctx) {
         if (server == null && allowUntrustedServer == null && captureTaskInputFiles == null && uploadInBackground == null && publishCriteria == null) {
             return null;
         }
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/MigrateGradleEnterpriseToDevelocity.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/MigrateGradleEnterpriseToDevelocity.java
index 88d4376f0a5..a822a3d46a9 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/MigrateGradleEnterpriseToDevelocity.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/MigrateGradleEnterpriseToDevelocity.java
@@ -236,8 +236,7 @@ private boolean withinMethodInvocations(List<String> methods) {
             return null;
         }
 
-        @Nullable
-        private J.MethodInvocation develocityPublishAlwaysIfDsl(String indent, ExecutionContext ctx) {
+        private @Nullable J.MethodInvocation develocityPublishAlwaysIfDsl(String indent, ExecutionContext ctx) {
             StringBuilder ge = new StringBuilder("\ndevelocity {\n");
             ge.append(indent).append("buildScan {\n");
             ge.append(indent).append(indent).append("publishing.onlyIf { true }\n");
@@ -256,8 +255,7 @@ private J.MethodInvocation develocityPublishAlwaysIfDsl(String indent, Execution
             return (J.MethodInvocation) ((J.Return) ((J.Block) ((J.Lambda) buildScan.getArguments().get(0)).getBody()).getStatements().get(0)).getExpression();
         }
 
-        @Nullable
-        private J.MethodInvocation develocityPublishOnFailureIfDsl(String indent, ExecutionContext ctx) {
+        private @Nullable J.MethodInvocation develocityPublishOnFailureIfDsl(String indent, ExecutionContext ctx) {
             StringBuilder ge = new StringBuilder("\ndevelocity {\n");
             ge.append(indent).append("buildScan {\n");
             ge.append(indent).append(indent).append("publishing.onlyIf { !it.buildResult.failures.empty }\n");
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/util/DependencyStringNotationConverter.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/util/DependencyStringNotationConverter.java
index 29bcdd4f326..fa1c6893565 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/util/DependencyStringNotationConverter.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/util/DependencyStringNotationConverter.java
@@ -23,8 +23,7 @@ public class DependencyStringNotationConverter {
      * @param notation a String in the format group:artifact:version
      * @return A corresponding Dependency or null if the notation could not be parsed
      */
-    @Nullable
-    public static Dependency parse(String notation) {
+    public static @Nullable Dependency parse(String notation) {
         int idx = notation.lastIndexOf('@');
         if (idx == -1) {
             return parse(notation, null);
@@ -38,8 +37,7 @@ public static Dependency parse(String notation) {
         return parse(notation, null);
     }
 
-    @Nullable
-    private static Dependency parse(String notation, @Nullable String ext) {
+    private static @Nullable Dependency parse(String notation, @Nullable String ext) {
         Dependency dependency = new Dependency(null, null, null, null, ext);
 
         int count = 0;
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/util/GradleWrapper.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/util/GradleWrapper.java
index 9efe9ed707c..61ff6c83429 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/util/GradleWrapper.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/util/GradleWrapper.java
@@ -116,8 +116,7 @@ public String getPropertiesFormattedUrl() {
         return formatUriForPropertiesFile(getDistributionUrl());
     }
 
-    @Nullable
-    public Checksum getDistributionChecksum() {
+    public @Nullable Checksum getDistributionChecksum() {
         return distributionInfos.getChecksum();
     }
 
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 14b8cc09ada..e0f1ed7b378 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParser.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParser.java
@@ -278,8 +278,7 @@ public GroovyParser.Builder compilerCustomizers(Iterable<Consumer<CompilerConfig
             return this;
         }
 
-        @Nullable
-        private Collection<Path> resolvedClasspath() {
+        private @Nullable Collection<Path> resolvedClasspath() {
             if (artifactNames != null && !artifactNames.isEmpty()) {
                 classpath = JavaParser.dependenciesFromClasspath(artifactNames.toArray(new String[0]));
                 artifactNames = null;
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 063a63baf29..616443692c9 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java
@@ -203,8 +203,7 @@ private JavaType genericType(GenericsType g, String signature) {
         return gtv;
     }
 
-    @Nullable
-    public JavaType.Method methodType(@Nullable MethodNode node) {
+    public @Nullable JavaType.Method methodType(@Nullable MethodNode node) {
         if (node == null) {
             return null;
         }
@@ -265,8 +264,7 @@ public JavaType.Method methodType(@Nullable MethodNode node) {
         return method;
     }
 
-    @Nullable
-    public JavaType.Variable variableType(@Nullable FieldNode node) {
+    public @Nullable JavaType.Variable variableType(@Nullable FieldNode node) {
         if (node == null) {
             return null;
         }
@@ -295,13 +293,11 @@ public JavaType.Variable variableType(@Nullable FieldNode node) {
     /**
      * With an undefined owner
      */
-    @Nullable
-    public JavaType.Variable variableType(String name, @Nullable ASTNode type) {
+    public @Nullable JavaType.Variable variableType(String name, @Nullable ASTNode type) {
         return variableType(name, type(type));
     }
 
-    @Nullable
-    public JavaType.Variable variableType(String name, @Nullable JavaType type) {
+    public @Nullable JavaType.Variable variableType(String name, @Nullable JavaType type) {
         if (type == null) {
             return null;
         }
@@ -325,8 +321,7 @@ public JavaType.Variable variableType(String name, @Nullable JavaType type) {
         return variable;
     }
 
-    @Nullable
-    private List<JavaType.FullyQualified> getAnnotations(AnnotatedNode node) {
+    private @Nullable List<JavaType.FullyQualified> getAnnotations(AnnotatedNode node) {
         List<JavaType.FullyQualified> annotations = null;
         for (AnnotationNode a : node.getAnnotations()) {
             annotations = new ArrayList<>(node.getAnnotations().size());
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/MinimumViableSpacingVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/MinimumViableSpacingVisitor.java
index 3fe11b5a9a8..bd803bafb1b 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/MinimumViableSpacingVisitor.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/MinimumViableSpacingVisitor.java
@@ -44,18 +44,16 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, P p)
         }));
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/OmitParenthesesForLastArgumentLambdaVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/OmitParenthesesForLastArgumentLambdaVisitor.java
index 5af161c45ba..ee16d624e4e 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/OmitParenthesesForLastArgumentLambdaVisitor.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/format/OmitParenthesesForLastArgumentLambdaVisitor.java
@@ -47,18 +47,16 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, P p)
         }));
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
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 35fabf8b793..60198f49883 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
@@ -52,8 +52,7 @@ default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
         return v.isAdaptableTo(GroovyVisitor.class);
     }
 
-    @Nullable
-    default <P> J acceptGroovy(GroovyVisitor<P> v, P p) {
+    default <P> @Nullable J acceptGroovy(GroovyVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
@@ -133,9 +132,8 @@ public SourceFile withCharset(Charset charset) {
         @Nullable
         JRightPadded<Package> packageDeclaration;
 
-        @Nullable
         @Override
-        public Package getPackageDeclaration() {
+        public @Nullable Package getPackageDeclaration() {
             return packageDeclaration == null ? null : packageDeclaration.getElement();
         }
 
@@ -256,8 +254,7 @@ public Padding getPadding() {
         public static class Padding implements JavaSourceFile.Padding {
             private final G.CompilationUnit t;
 
-            @Nullable
-            public JRightPadded<Package> getPackageDeclaration() {
+            public @Nullable JRightPadded<Package> getPackageDeclaration() {
                 return t.packageDeclaration;
             }
 
@@ -510,8 +507,7 @@ public Padding getPadding() {
         public static class Padding {
             private final MapEntry t;
 
-            @Nullable
-            public JRightPadded<Expression> getKey() {
+            public @Nullable JRightPadded<Expression> getKey() {
                 return t.key;
             }
 
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/JsonPathMatcher.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/JsonPathMatcher.java
index 1432aceb317..a8a44de766f 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/JsonPathMatcher.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/JsonPathMatcher.java
@@ -576,8 +576,7 @@ public Object visitBinaryExpression(JsonPathParser.BinaryExpressionContext ctx)
             return null;
         }
 
-        @Nullable
-        private Object getBinaryExpressionResult(Object ctx) {
+        private @Nullable Object getBinaryExpressionResult(Object ctx) {
             if (ctx instanceof JsonPathParser.BinaryExpressionContext) {
                 ctx = visitBinaryExpression((JsonPathParser.BinaryExpressionContext) ctx);
 
@@ -597,8 +596,7 @@ private Object getBinaryExpressionResult(Object ctx) {
         }
 
         // Interpret the LHS to check the appropriate value.
-        @Nullable
-        private Hcl getOperatorResult(Object lhs, String operator, Object rhs) {
+        private @Nullable Hcl getOperatorResult(Object lhs, String operator, Object rhs) {
             if (lhs instanceof Hcl.Attribute) {
                 Hcl.Attribute attr = (Hcl.Attribute) lhs;
                 if (attr.getValue() instanceof Hcl.Literal) {
@@ -648,8 +646,7 @@ private boolean checkObjectEquality(Object lhs, String operator, Object rhs) {
         }
 
         // Extract the result from JSON objects that can match by key.
-        @Nullable
-        public Object getResultByKey(Object result, String key) {
+        public @Nullable Object getResultByKey(Object result, String key) {
             if (result instanceof Hcl.Block) {
                 Hcl.Block block = (Hcl.Block) result;
                 for (Hcl body : block.getBody()) {
@@ -690,8 +687,7 @@ private Object getResultFromList(Object results) {
         }
 
         // Extract the value from a Json object.
-        @Nullable
-        private Object getValue(Object result) {
+        private @Nullable Object getValue(Object result) {
             if (result instanceof Hcl.Attribute) {
                 return getValue(((Hcl.Attribute) result).getValue());
             } else if (result instanceof Hcl.Block) {
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/RandomizeIdVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/RandomizeIdVisitor.java
index 46781c089b6..18140b96a8a 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/RandomizeIdVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/RandomizeIdVisitor.java
@@ -21,9 +21,9 @@
 import static org.openrewrite.Tree.randomId;
 
 public class RandomizeIdVisitor<P> extends HclVisitor<P> {
-    @Nullable
+
     @Override
-    public Hcl postVisit(Hcl tree, P p) {
+    public @Nullable Hcl postVisit(Hcl tree, P p) {
         return tree.withId(randomId());
     }
 }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/AttributeSpaceVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/AttributeSpaceVisitor.java
index 144ace04054..075c62e875c 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/AttributeSpaceVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/AttributeSpaceVisitor.java
@@ -132,18 +132,16 @@ private int endColumn(Hcl.Attribute attribute) {
         return (attribute.getPrefix().getIndent() + attribute.getName().print(getCursor())).length();
     }
 
-    @Nullable
     @Override
-    public Hcl postVisit(Hcl tree, P p) {
+    public @Nullable Hcl postVisit(Hcl tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Hcl.ConfigFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Hcl visit(@Nullable Tree tree, P p) {
+    public @Nullable Hcl visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Hcl) tree;
         }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BlankLinesVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BlankLinesVisitor.java
index f82c8874974..46aa5a6ac5d 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BlankLinesVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BlankLinesVisitor.java
@@ -109,18 +109,16 @@ private String minimumLines(String whitespace, int min) {
         return minWhitespace;
     }
 
-    @Nullable
     @Override
-    public Hcl postVisit(Hcl tree, P p) {
+    public @Nullable Hcl postVisit(Hcl tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Hcl.ConfigFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Hcl visit(@Nullable Tree tree, P p) {
+    public @Nullable Hcl visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Hcl) tree;
         }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BracketsVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BracketsVisitor.java
index 7666468f9e3..a88ad9efe8f 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BracketsVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BracketsVisitor.java
@@ -112,19 +112,16 @@ public Hcl.Block visitBlock(final Hcl.Block block, final P p) {
         return super.visitBlock(block, p);
     }
 
-
-    @Nullable
     @Override
-    public Hcl postVisit(Hcl tree, P p) {
+    public @Nullable Hcl postVisit(Hcl tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Hcl.ConfigFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Hcl visit(@Nullable Tree tree, P p) {
+    public @Nullable Hcl visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Hcl) tree;
         }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/SpacesVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/SpacesVisitor.java
index 7d6c1788b9c..52a934fee2a 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/SpacesVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/SpacesVisitor.java
@@ -69,18 +69,16 @@ public Hcl.Block visitBlock(Hcl.Block block, P p) {
         return b;
     }
 
-    @Nullable
     @Override
-    public Hcl postVisit(Hcl tree, P p) {
+    public @Nullable Hcl postVisit(Hcl tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Hcl.ConfigFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Hcl visit(@Nullable Tree tree, P p) {
+    public @Nullable Hcl visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Hcl) tree;
         }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/TabsAndIndentsVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/TabsAndIndentsVisitor.java
index 1d0d0c94e01..ad4a40ad88a 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/TabsAndIndentsVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/TabsAndIndentsVisitor.java
@@ -50,8 +50,7 @@ public TabsAndIndentsVisitor(TabsAndIndentsStyle style, @Nullable Tree stopAfter
     }
 
     @Override
-    @Nullable
-    public Hcl visit(@Nullable Tree tree, P p, Cursor parent) {
+    public @Nullable Hcl visit(@Nullable Tree tree, P p, Cursor parent) {
         setCursor(parent);
         for (Cursor c = parent; c != null; c = c.getParent()) {
             Object v = c.getValue();
@@ -81,8 +80,7 @@ public Hcl visit(@Nullable Tree tree, P p, Cursor parent) {
     }
 
     @Override
-    @Nullable
-    public Hcl preVisit(Hcl tree, P p) {
+    public @Nullable Hcl preVisit(Hcl tree, P p) {
         if (tree instanceof Hcl.Block || tree instanceof Hcl.ObjectValue) {
             getCursor().putMessage("indentType", IndentType.INDENT);
         } else {
@@ -595,18 +593,16 @@ private int getLengthOfWhitespace(@Nullable String whitespace) {
         return size;
     }
 
-    @Nullable
     @Override
-    public Hcl postVisit(Hcl tree, P p) {
+    public @Nullable Hcl postVisit(Hcl tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Hcl.ConfigFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Hcl visit(@Nullable Tree tree, P p) {
+    public @Nullable Hcl visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Hcl) tree;
         }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclParserVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclParserVisitor.java
index 3a9d14af570..8d93f600305 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclParserVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclParserVisitor.java
@@ -686,8 +686,7 @@ private String prefix(@Nullable TerminalNode terminalNode) {
         return terminalNode == null ? "" : prefix(terminalNode.getSymbol());
     }
 
-    @Nullable
-    private <C extends ParserRuleContext, T> T convert(C ctx, BiFunction<C, String, T> conversion) {
+    private <C extends ParserRuleContext, T> @Nullable T convert(C ctx, BiFunction<C, String, T> conversion) {
         if (ctx == null) {
             return null;
         }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/template/Substitutions.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/template/Substitutions.java
index 6fa0defc096..c2504684d59 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/template/Substitutions.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/template/Substitutions.java
@@ -79,8 +79,7 @@ public Hcl visitExpression(Expression expression, Integer integer) {
                 return super.visitExpression(expression, integer);
             }
 
-            @Nullable
-            private Hcl maybeParameter(Hcl h) {
+            private @Nullable Hcl maybeParameter(Hcl h) {
                 Integer param = parameterIndex(h.getPrefix());
                 if (param != null) {
                     Hcl h2 = (Hcl) parameters[param];
@@ -89,8 +88,7 @@ private Hcl maybeParameter(Hcl h) {
                 return null;
             }
 
-            @Nullable
-            private Integer parameterIndex(Space space) {
+            private @Nullable Integer parameterIndex(Space space) {
                 for (Comment comment : space.getComments()) {
                     java.util.regex.Matcher matcher = PATTERN_COMMENT.matcher(comment.getText());
                     if (matcher.matches()) {
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 c46f0c714e5..6c74120cc89 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
@@ -46,8 +46,7 @@ default <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
         return (R) acceptHcl(v.adapt(HclVisitor.class), p);
     }
 
-    @Nullable
-    default <P> Hcl acceptHcl(HclVisitor<P> v, P p) {
+    default <P> @Nullable Hcl acceptHcl(HclVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
@@ -363,8 +362,7 @@ class Block implements BodyContent, Expression {
         List<BodyContent> body;
 
         @Incubating(since = "7.27.0")
-        @Nullable
-        public Attribute getAttribute(String attrName) {
+        public @Nullable Attribute getAttribute(String attrName) {
             for (BodyContent t : body) {
                 if (t instanceof Attribute) {
                     Attribute attribute = (Attribute) t;
@@ -410,8 +408,7 @@ public Hcl.Block withAttributeValue(String attrName, Object value) {
          * @return The text value of the attribute matching the provided name, if any.
          */
         @Incubating(since = "7.27.0")
-        @Nullable
-        public <T> T getAttributeValue(String attrName) {
+        public <T> @Nullable T getAttributeValue(String attrName) {
             Attribute attr = getAttribute(attrName);
             if (attr == null) {
                 return null;
@@ -769,8 +766,7 @@ public ForObject withUpdateValue(Expression updateValue) {
         @Nullable
         HclLeftPadded<Expression> condition;
 
-        @Nullable
-        public Expression getCondition() {
+        public @Nullable Expression getCondition() {
             return condition == null ? null : condition.getElement();
         }
 
@@ -827,8 +823,7 @@ public ForObject withUpdateValue(HclLeftPadded<Expression> updateValue) {
                 return t.updateValue == updateValue ? t : new ForObject(t.id, t.prefix, t.markers, t.intro, t.updateName, updateValue, t.ellipsis, t.condition, t.end);
             }
 
-            @Nullable
-            public HclLeftPadded<Expression> getCondition() {
+            public @Nullable HclLeftPadded<Expression> getCondition() {
                 return t.condition;
             }
 
@@ -877,8 +872,7 @@ public ForTuple withUpdateName(Expression updateName) {
         @Nullable
         HclLeftPadded<Expression> condition;
 
-        @Nullable
-        public Expression getCondition() {
+        public @Nullable Expression getCondition() {
             return condition == null ? null : condition.getElement();
         }
 
@@ -927,8 +921,7 @@ public ForTuple withUpdate(HclLeftPadded<Expression> update) {
                 return t.update == update ? t : new ForTuple(t.id, t.prefix, t.markers, t.intro, update, t.condition, t.end);
             }
 
-            @Nullable
-            public HclLeftPadded<Expression> getCondition() {
+            public @Nullable HclLeftPadded<Expression> getCondition() {
                 return t.condition;
             }
 
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclContainer.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclContainer.java
index 88ac90dfcc2..f8b22a31461 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclContainer.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclContainer.java
@@ -144,8 +144,7 @@ public HclContainer<T> withElements(List<HclRightPadded<T>> elements) {
         }
     }
 
-    @Nullable
-    public static <H extends Hcl> HclContainer<H> withElementsNullable(@Nullable HclContainer<H> before, @Nullable List<H> elements) {
+    public static <H extends Hcl> @Nullable HclContainer<H> withElementsNullable(@Nullable HclContainer<H> before, @Nullable List<H> elements) {
         if (before == null) {
             if (elements == null || elements.isEmpty()) {
                 return null;
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclCoordinates.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclCoordinates.java
index 9e7d8bb4860..6ac1f4e340c 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclCoordinates.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclCoordinates.java
@@ -43,8 +43,7 @@ public enum Mode {
         REPLACEMENT
     }
 
-    @Nullable
-    public <H extends Hcl> Comparator<H> getComparator() {
+    public <H extends Hcl> @Nullable Comparator<H> getComparator() {
         //noinspection unchecked
         return (Comparator<H>) comparator;
     }
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclLeftPadded.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclLeftPadded.java
index 6fb528aedeb..f7eb7dfd4a1 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclLeftPadded.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclLeftPadded.java
@@ -54,8 +54,7 @@ public Space.Location getBeforeLocation() {
         }
     }
 
-    @Nullable
-    public static <T> HclLeftPadded<T> withElement(@Nullable HclLeftPadded<T> before, @Nullable T elements) {
+    public static <T> @Nullable HclLeftPadded<T> withElement(@Nullable HclLeftPadded<T> before, @Nullable T elements) {
         if (before == null) {
             if (elements == null) {
                 return null;
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclRightPadded.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclRightPadded.java
index 891424e7b5a..c51ff2d27ed 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclRightPadded.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/tree/HclRightPadded.java
@@ -75,8 +75,7 @@ public static <T> List<T> getElements(List<HclRightPadded<T>> ls) {
         return list;
     }
 
-    @Nullable
-    public static <T> HclRightPadded<T> withElement(@Nullable HclRightPadded<T> before, @Nullable T elements) {
+    public static <T> @Nullable HclRightPadded<T> withElement(@Nullable HclRightPadded<T> before, @Nullable T elements) {
         if (before == null) {
             if (elements == null) {
                 return null;
diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java
index ff6a4405564..c32b6b1e7b5 100644
--- a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java
+++ b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11JavadocVisitor.java
@@ -678,8 +678,7 @@ public J visitReference(@Nullable ReferenceTree node, List<Javadoc> body) {
         return qualifier;
     }
 
-    @Nullable
-    private JavaType.Method methodReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
+    private @Nullable JavaType.Method methodReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
         if (type instanceof  JavaType.Class) {
             JavaType.Class classType = (JavaType.Class) type;
 
@@ -735,8 +734,7 @@ private boolean paramTypeMatches(JavaType testParamType, Type paramType) {
         return false;
     }
 
-    @Nullable
-    private JavaType.Variable fieldReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
+    private @Nullable JavaType.Variable fieldReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
         JavaType.Class classType = TypeUtils.asClass(type);
         if (classType == null) {
             return null;
diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java
index 8ac55431d57..eb7c94c0bfb 100644
--- a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java
+++ b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11ParserVisitor.java
@@ -1627,13 +1627,11 @@ private long lineNumber(Tree tree) {
         return source.substring(0, ((JCTree) tree).getStartPosition()).chars().filter(c -> c == '\n').count() + 1;
     }
 
-    @Nullable
-    private <T extends J> T convertOrNull(@Nullable Tree t) {
+    private <T extends J> @Nullable T convertOrNull(@Nullable Tree t) {
         return t == null ? null : convert(t);
     }
 
-    @Nullable
-    private <J2 extends J> JRightPadded<J2> convertOrNull(@Nullable Tree t, Function<Tree, Space> suffix) {
+    private <J2 extends J> @Nullable JRightPadded<J2> convertOrNull(@Nullable Tree t, Function<Tree, Space> suffix) {
         return t == null ? null : convert(t, suffix);
     }
 
@@ -1659,8 +1657,7 @@ private <J2 extends J> List<JRightPadded<J2>> convertAll(List<? extends Tree> tr
         return converted;
     }
 
-    @Nullable
-    private JContainer<Expression> convertTypeParameters(@Nullable List<? extends Tree> typeArguments) {
+    private @Nullable JContainer<Expression> convertTypeParameters(@Nullable List<? extends Tree> typeArguments) {
         if (typeArguments == null) {
             return null;
         }
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 d12c12036e9..496dffe5df1 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
@@ -358,8 +358,7 @@ public JavaType type(@Nullable Tree tree) {
         return type(((JCTree) tree).type, symbol);
     }
 
-    @Nullable
-    private JavaType type(Type type, Symbol symbol) {
+    private @Nullable JavaType type(Type type, Symbol symbol) {
         if (type instanceof Type.MethodType) {
             return methodInvocationType(type, symbol);
         }
@@ -397,13 +396,11 @@ public JavaType.Primitive primitive(TypeTag tag) {
         }
     }
 
-    @Nullable
-    public JavaType.Variable variableType(@Nullable Symbol symbol) {
+    public @Nullable JavaType.Variable variableType(@Nullable Symbol symbol) {
         return variableType(symbol, null);
     }
 
-    @Nullable
-    private JavaType.Variable variableType(@Nullable Symbol symbol,
+    private @Nullable JavaType.Variable variableType(@Nullable Symbol symbol,
                                            @Nullable JavaType.FullyQualified owner) {
         if (!(symbol instanceof Symbol.VarSymbol)) {
             return null;
@@ -450,8 +447,7 @@ private JavaType.Variable variableType(@Nullable Symbol symbol,
      * @param symbol     The method symbol.
      * @return Method type attribution.
      */
-    @Nullable
-    public JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.Type selectType, @Nullable Symbol symbol) {
+    public @Nullable JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.Type selectType, @Nullable Symbol symbol) {
         if (selectType == null || selectType instanceof Type.ErrorType || symbol == null || symbol.kind == Kinds.Kind.ERR || symbol.type instanceof Type.UnknownType) {
             return null;
         }
@@ -551,8 +547,7 @@ public JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.T
      * @param declaringType The method's declaring type.
      * @return Method type attribution.
      */
-    @Nullable
-    public JavaType.Method methodDeclarationType(@Nullable Symbol symbol, @Nullable JavaType.FullyQualified declaringType) {
+    public @Nullable JavaType.Method methodDeclarationType(@Nullable Symbol symbol, @Nullable JavaType.FullyQualified declaringType) {
         // if the symbol is not a method symbol, there is a parser error in play
         Symbol.MethodSymbol methodSymbol = symbol instanceof Symbol.MethodSymbol ? (Symbol.MethodSymbol) symbol : null;
 
@@ -680,8 +675,7 @@ private void completeClassSymbol(Symbol.ClassSymbol classSymbol) {
         }
     }
 
-    @Nullable
-    private List<JavaType.FullyQualified> listAnnotations(Symbol symb) {
+    private @Nullable List<JavaType.FullyQualified> listAnnotations(Symbol symb) {
         List<JavaType.FullyQualified> annotations = null;
         if (!symb.getDeclarationAttributes().isEmpty()) {
             annotations = new ArrayList<>(symb.getDeclarationAttributes().size());
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 01449e898cc..8ebec86b88e 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
@@ -681,8 +681,7 @@ public J visitReference(@Nullable ReferenceTree node, List<Javadoc> body) {
         return qualifier;
     }
 
-    @Nullable
-    private JavaType.Method methodReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
+    private @Nullable JavaType.Method methodReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
         if (type instanceof JavaType.Class) {
             JavaType.Class classType = (JavaType.Class) type;
 
@@ -738,8 +737,7 @@ private boolean paramTypeMatches(JavaType testParamType, Type paramType) {
         return false;
     }
 
-    @Nullable
-    private JavaType.Variable fieldReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
+    private @Nullable JavaType.Variable fieldReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
         JavaType.Class classType = TypeUtils.asClass(type);
         if (classType == null) {
             return null;
diff --git a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java
index 72de3ee6a13..b98eb15e949 100644
--- a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java
+++ b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java
@@ -1706,13 +1706,11 @@ private long lineNumber(Tree tree) {
         return source.substring(0, ((JCTree) tree).getStartPosition()).chars().filter(c -> c == '\n').count() + 1;
     }
 
-    @Nullable
-    private <T extends J> T convertOrNull(@Nullable Tree t) {
+    private <T extends J> @Nullable T convertOrNull(@Nullable Tree t) {
         return t == null ? null : convert(t);
     }
 
-    @Nullable
-    private <J2 extends J> JRightPadded<J2> convertOrNull(@Nullable Tree t, Function<Tree, Space> suffix) {
+    private <J2 extends J> @Nullable JRightPadded<J2> convertOrNull(@Nullable Tree t, Function<Tree, Space> suffix) {
         return t == null ? null : convert(t, suffix);
     }
 
@@ -1738,8 +1736,7 @@ private <J2 extends J> List<JRightPadded<J2>> convertAll(List<? extends Tree> tr
         return converted;
     }
 
-    @Nullable
-    private JContainer<Expression> convertTypeParameters(@Nullable List<? extends Tree> typeArguments) {
+    private @Nullable JContainer<Expression> convertTypeParameters(@Nullable List<? extends Tree> typeArguments) {
         if (typeArguments == null) {
             return null;
         }
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 20b788c5ed1..825dd970522 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
@@ -357,8 +357,7 @@ public JavaType type(@Nullable Tree tree) {
         return type(((JCTree) tree).type, symbol);
     }
 
-    @Nullable
-    private JavaType type(Type type, Symbol symbol) {
+    private @Nullable JavaType type(Type type, Symbol symbol) {
         if (type instanceof Type.MethodType) {
             return methodInvocationType(type, symbol);
         }
@@ -396,13 +395,11 @@ public JavaType.Primitive primitive(TypeTag tag) {
         }
     }
 
-    @Nullable
-    public JavaType.Variable variableType(@Nullable Symbol symbol) {
+    public @Nullable JavaType.Variable variableType(@Nullable Symbol symbol) {
         return variableType(symbol, null);
     }
 
-    @Nullable
-    private JavaType.Variable variableType(@Nullable Symbol symbol,
+    private @Nullable JavaType.Variable variableType(@Nullable Symbol symbol,
                                            @Nullable JavaType.FullyQualified owner) {
         if (!(symbol instanceof Symbol.VarSymbol)) {
             return null;
@@ -449,8 +446,7 @@ private JavaType.Variable variableType(@Nullable Symbol symbol,
      * @param symbol     The method symbol.
      * @return Method type attribution.
      */
-    @Nullable
-    public JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.Type selectType, @Nullable Symbol symbol) {
+    public @Nullable JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.Type selectType, @Nullable Symbol symbol) {
         if (selectType == null || selectType instanceof Type.ErrorType || symbol == null || symbol.kind == Kinds.Kind.ERR || symbol.type instanceof Type.UnknownType) {
             return null;
         }
@@ -552,8 +548,7 @@ public JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.T
      * @param declaringType The method's declaring type.
      * @return Method type attribution.
      */
-    @Nullable
-    public JavaType.Method methodDeclarationType(@Nullable Symbol symbol, @Nullable JavaType.FullyQualified declaringType) {
+    public @Nullable JavaType.Method methodDeclarationType(@Nullable Symbol symbol, @Nullable JavaType.FullyQualified declaringType) {
         // if the symbol is not a method symbol, there is a parser error in play
         Symbol.MethodSymbol methodSymbol = symbol instanceof Symbol.MethodSymbol ? (Symbol.MethodSymbol) symbol : null;
 
@@ -681,8 +676,7 @@ private void completeClassSymbol(Symbol.ClassSymbol classSymbol) {
         }
     }
 
-    @Nullable
-    private List<JavaType.FullyQualified> listAnnotations(Symbol symb) {
+    private @Nullable List<JavaType.FullyQualified> listAnnotations(Symbol symb) {
         List<JavaType.FullyQualified> annotations = null;
         if (!symb.getDeclarationAttributes().isEmpty()) {
             annotations = new ArrayList<>(symb.getDeclarationAttributes().size());
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 c62c4a91c7c..57cbeacd062 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
@@ -681,8 +681,7 @@ public J visitReference(@Nullable ReferenceTree node, List<Javadoc> body) {
         return qualifier;
     }
 
-    @Nullable
-    private JavaType.Method methodReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
+    private @Nullable JavaType.Method methodReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
         if (type instanceof JavaType.Class) {
             JavaType.Class classType = (JavaType.Class) type;
 
@@ -738,8 +737,7 @@ private boolean paramTypeMatches(JavaType testParamType, Type paramType) {
         return false;
     }
 
-    @Nullable
-    private JavaType.Variable fieldReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
+    private @Nullable JavaType.Variable fieldReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
         JavaType.Class classType = TypeUtils.asClass(type);
         if (classType == null) {
             return null;
diff --git a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java
index ea7f35d9f5f..cfb90bd1378 100644
--- a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java
+++ b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21ParserVisitor.java
@@ -1703,13 +1703,11 @@ private long lineNumber(Tree tree) {
         return source.substring(0, ((JCTree) tree).getStartPosition()).chars().filter(c -> c == '\n').count() + 1;
     }
 
-    @Nullable
-    private <T extends J> T convertOrNull(@Nullable Tree t) {
+    private <T extends J> @Nullable T convertOrNull(@Nullable Tree t) {
         return t == null ? null : convert(t);
     }
 
-    @Nullable
-    private <J2 extends J> JRightPadded<J2> convertOrNull(@Nullable Tree t, Function<Tree, Space> suffix) {
+    private <J2 extends J> @Nullable JRightPadded<J2> convertOrNull(@Nullable Tree t, Function<Tree, Space> suffix) {
         return t == null ? null : convert(t, suffix);
     }
 
@@ -1735,8 +1733,7 @@ private <J2 extends J> List<JRightPadded<J2>> convertAll(List<? extends Tree> tr
         return converted;
     }
 
-    @Nullable
-    private JContainer<Expression> convertTypeParameters(@Nullable List<? extends Tree> typeArguments) {
+    private @Nullable JContainer<Expression> convertTypeParameters(@Nullable List<? extends Tree> typeArguments) {
         if (typeArguments == null) {
             return null;
         }
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 260213913bf..20ef8c85a1e 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
@@ -375,8 +375,7 @@ public JavaType type(@Nullable Tree tree) {
         return type(((JCTree) tree).type, symbol);
     }
 
-    @Nullable
-    private JavaType type(Type type, Symbol symbol) {
+    private @Nullable JavaType type(Type type, Symbol symbol) {
         if (type instanceof Type.MethodType) {
             return methodInvocationType(type, symbol);
         }
@@ -414,13 +413,11 @@ public JavaType.Primitive primitive(TypeTag tag) {
         }
     }
 
-    @Nullable
-    public JavaType.Variable variableType(@Nullable Symbol symbol) {
+    public @Nullable JavaType.Variable variableType(@Nullable Symbol symbol) {
         return variableType(symbol, null);
     }
 
-    @Nullable
-    private JavaType.Variable variableType(@Nullable Symbol symbol,
+    private @Nullable JavaType.Variable variableType(@Nullable Symbol symbol,
                                            @Nullable JavaType.FullyQualified owner) {
         if (!(symbol instanceof Symbol.VarSymbol)) {
             return null;
@@ -467,8 +464,7 @@ private JavaType.Variable variableType(@Nullable Symbol symbol,
      * @param symbol     The method symbol.
      * @return Method type attribution.
      */
-    @Nullable
-    public JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.Type selectType, @Nullable Symbol symbol) {
+    public @Nullable JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.Type selectType, @Nullable Symbol symbol) {
         if (selectType == null || selectType instanceof Type.ErrorType || symbol == null || symbol.kind == Kinds.Kind.ERR || symbol.type instanceof Type.UnknownType) {
             return null;
         }
@@ -570,8 +566,7 @@ public JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.T
      * @param declaringType The method's declaring type.
      * @return Method type attribution.
      */
-    @Nullable
-    public JavaType.Method methodDeclarationType(@Nullable Symbol symbol, @Nullable JavaType.FullyQualified declaringType) {
+    public @Nullable JavaType.Method methodDeclarationType(@Nullable Symbol symbol, @Nullable JavaType.FullyQualified declaringType) {
         // if the symbol is not a method symbol, there is a parser error in play
         Symbol.MethodSymbol methodSymbol = symbol instanceof Symbol.MethodSymbol ? (Symbol.MethodSymbol) symbol : null;
 
@@ -699,8 +694,7 @@ private void completeClassSymbol(Symbol.ClassSymbol classSymbol) {
         }
     }
 
-    @Nullable
-    private List<JavaType.FullyQualified> listAnnotations(Symbol symb) {
+    private @Nullable List<JavaType.FullyQualified> listAnnotations(Symbol symb) {
         List<JavaType.FullyQualified> annotations = null;
         if (!symb.getDeclarationAttributes().isEmpty()) {
             annotations = new ArrayList<>(symb.getDeclarationAttributes().size());
diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java
index 0969742b555..7a44272d981 100644
--- a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java
+++ b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8JavadocVisitor.java
@@ -638,8 +638,7 @@ public J visitReference(@Nullable ReferenceTree node, List<Javadoc> body) {
         return qualifier;
     }
 
-    @Nullable
-    private JavaType.Method methodReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
+    private @Nullable JavaType.Method methodReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
         JavaType.Class classType = TypeUtils.asClass(type);
         if (classType == null) {
             return null;
@@ -689,8 +688,7 @@ private boolean paramTypeMatches(JavaType testParamType, Type paramType) {
         return false;
     }
 
-    @Nullable
-    private JavaType.Variable fieldReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
+    private @Nullable JavaType.Variable fieldReferenceType(DCTree.DCReference ref, @Nullable JavaType type) {
         JavaType.Class classType = TypeUtils.asClass(type);
         if (classType == null) {
             return null;
diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java
index 7a4489fe169..f960996a2da 100644
--- a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java
+++ b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8ParserVisitor.java
@@ -1620,13 +1620,11 @@ private long lineNumber(Tree tree) {
         return lineNumber;
     }
 
-    @Nullable
-    private <T extends J> T convertOrNull(@Nullable Tree t) {
+    private <T extends J> @Nullable T convertOrNull(@Nullable Tree t) {
         return t == null ? null : convert(t);
     }
 
-    @Nullable
-    private <J2 extends J> JRightPadded<J2> convertOrNull(@Nullable Tree t, Function<Tree, Space> suffix) {
+    private <J2 extends J> @Nullable JRightPadded<J2> convertOrNull(@Nullable Tree t, Function<Tree, Space> suffix) {
         return t == null ? null : convert(t, suffix);
     }
 
@@ -1652,8 +1650,7 @@ private <J2 extends J> List<JRightPadded<J2>> convertAll(List<? extends Tree> tr
         return converted;
     }
 
-    @Nullable
-    private JContainer<Expression> convertTypeParameters(@Nullable List<? extends Tree> typeArguments) {
+    private @Nullable JContainer<Expression> convertTypeParameters(@Nullable List<? extends Tree> typeArguments) {
         if (typeArguments == null) {
             return null;
         }
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 ffb952193c6..16b348f7253 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
@@ -358,8 +358,7 @@ public JavaType type(@Nullable Tree tree) {
         return type(((JCTree) tree).type, symbol);
     }
 
-    @Nullable
-    private JavaType type(Type type, Symbol symbol) {
+    private @Nullable JavaType type(Type type, Symbol symbol) {
         if (type instanceof Type.MethodType) {
             return methodInvocationType(type, symbol);
         }
@@ -397,13 +396,11 @@ public JavaType.Primitive primitive(TypeTag tag) {
         }
     }
 
-    @Nullable
-    public JavaType.Variable variableType(@Nullable Symbol symbol) {
+    public @Nullable JavaType.Variable variableType(@Nullable Symbol symbol) {
         return variableType(symbol, null);
     }
 
-    @Nullable
-    private JavaType.Variable variableType(@Nullable Symbol symbol,
+    private @Nullable JavaType.Variable variableType(@Nullable Symbol symbol,
                                            @Nullable JavaType.FullyQualified owner) {
         if (!(symbol instanceof Symbol.VarSymbol)) {
             return null;
@@ -450,8 +447,7 @@ private JavaType.Variable variableType(@Nullable Symbol symbol,
      * @param symbol     The method symbol.
      * @return Method type attribution.
      */
-    @Nullable
-    public JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.Type selectType, @Nullable Symbol symbol) {
+    public @Nullable JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.Type selectType, @Nullable Symbol symbol) {
         if (selectType == null || selectType instanceof Type.ErrorType || symbol == null || symbol.kind == Kinds.ERR || symbol.type instanceof Type.UnknownType) {
             return null;
         }
@@ -551,8 +547,7 @@ public JavaType.Method methodInvocationType(@Nullable com.sun.tools.javac.code.T
      * @param declaringType The method's declaring type.
      * @return Method type attribution.
      */
-    @Nullable
-    public JavaType.Method methodDeclarationType(@Nullable Symbol symbol, @Nullable JavaType.FullyQualified declaringType) {
+    public @Nullable JavaType.Method methodDeclarationType(@Nullable Symbol symbol, @Nullable JavaType.FullyQualified declaringType) {
         // if the symbol is not a method symbol, there is a parser error in play
         Symbol.MethodSymbol methodSymbol = symbol instanceof Symbol.MethodSymbol ? (Symbol.MethodSymbol) symbol : null;
 
@@ -679,8 +674,7 @@ private void completeClassSymbol(Symbol.ClassSymbol classSymbol) {
         }
     }
 
-    @Nullable
-    private List<JavaType.FullyQualified> listAnnotations(Symbol symb) {
+    private @Nullable List<JavaType.FullyQualified> listAnnotations(Symbol symb) {
         List<JavaType.FullyQualified> annotations = null;
         if (!symb.getDeclarationAttributes().isEmpty()) {
             annotations = new ArrayList<>(symb.getDeclarationAttributes().size());
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/search/IsOrIsNotLikelyTestTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/search/IsOrIsNotLikelyTestTest.java
index b03df59b1ce..92fed7c6cad 100644
--- a/rewrite-java-test/src/test/java/org/openrewrite/java/search/IsOrIsNotLikelyTestTest.java
+++ b/rewrite-java-test/src/test/java/org/openrewrite/java/search/IsOrIsNotLikelyTestTest.java
@@ -174,9 +174,9 @@ void preconditionForOtherSourceType() {
               spec -> spec.recipe(toRecipe(() -> Preconditions.check(
                 Preconditions.or(new IsLikelyTest().getVisitor()),
                 new TreeVisitor<>() {
-                    @Nullable
+
                     @Override
-                    public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
+                    public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
                         return tree != null ? SearchResult.found(tree, "recipe") : null;
                     }
                 }))),
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/AddOrUpdateAnnotationAttribute.java b/rewrite-java/src/main/java/org/openrewrite/java/AddOrUpdateAnnotationAttribute.java
index 01e94c4ef04..fa55101ede3 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/AddOrUpdateAnnotationAttribute.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/AddOrUpdateAnnotationAttribute.java
@@ -157,8 +157,7 @@ public J.Annotation visitAnnotation(J.Annotation a, ExecutionContext ctx) {
         });
     }
 
-    @Nullable
-    private static String maybeQuoteStringArgument(@Nullable String attributeName, @Nullable String attributeValue, J.Annotation annotation) {
+    private static @Nullable String maybeQuoteStringArgument(@Nullable String attributeName, @Nullable String attributeValue, J.Annotation annotation) {
         if ((attributeValue != null) && attributeIsString(attributeName, annotation)) {
             return "\"" + attributeValue + "\"";
         } else {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ChangePackage.java b/rewrite-java/src/main/java/org/openrewrite/java/ChangePackage.java
index e31fc73fedb..f1a9f724d5d 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/ChangePackage.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/ChangePackage.java
@@ -242,8 +242,7 @@ public J postVisit(J tree, ExecutionContext ctx) {
             return j;
         }
 
-        @Nullable
-        private JavaType updateType(@Nullable JavaType oldType) {
+        private @Nullable JavaType updateType(@Nullable JavaType oldType) {
             if (oldType == null || oldType instanceof JavaType.Unknown) {
                 return oldType;
             }
@@ -308,8 +307,7 @@ private JavaType updateType(@Nullable JavaType oldType) {
             return oldType;
         }
 
-        @Nullable
-        private JavaType.Method updateType(@Nullable JavaType.Method oldMethodType) {
+        private @Nullable JavaType.Method updateType(@Nullable JavaType.Method oldMethodType) {
             if (oldMethodType != null) {
                 JavaType.Method method = (JavaType.Method) oldNameToChangedType.get(oldMethodType);
                 if (method != null) {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ChangeType.java b/rewrite-java/src/main/java/org/openrewrite/java/ChangeType.java
index fadbc756933..b4d480f4d09 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/ChangeType.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/ChangeType.java
@@ -420,8 +420,7 @@ private Expression updateOuterClassTypes(Expression typeTree) {
             return typeTree;
         }
 
-        @Nullable
-        private JavaType updateType(@Nullable JavaType oldType) {
+        private @Nullable JavaType updateType(@Nullable JavaType oldType) {
             if (oldType == null || oldType instanceof JavaType.Unknown) {
                 return oldType;
             }
@@ -485,8 +484,7 @@ private JavaType updateType(@Nullable JavaType oldType) {
             return oldType;
         }
 
-        @Nullable
-        private JavaType.Method updateType(@Nullable JavaType.Method oldMethodType) {
+        private @Nullable JavaType.Method updateType(@Nullable JavaType.Method oldMethodType) {
             if (oldMethodType != null) {
                 JavaType.Method method = (JavaType.Method) oldNameToChangedType.get(oldMethodType);
                 if (method != null) {
@@ -634,8 +632,7 @@ private JavaType updateType(@Nullable JavaType oldType) {
             return oldType;
         }
 
-        @Nullable
-        private JavaType.Method updateType(@Nullable JavaType.Method mt) {
+        private @Nullable JavaType.Method updateType(@Nullable JavaType.Method mt) {
             if (mt != null) {
                 return mt.withDeclaringType((JavaType.FullyQualified) updateType(mt.getDeclaringType()))
                         .withReturnType(updateType(mt.getReturnType()))
@@ -652,9 +649,9 @@ private boolean isTargetFullyQualifiedType(@Nullable JavaType.FullyQualified fq)
     public static boolean containsClassDefinition(JavaSourceFile sourceFile, String fullyQualifiedTypeName) {
         AtomicBoolean found = new AtomicBoolean(false);
         JavaIsoVisitor<AtomicBoolean> visitor = new JavaIsoVisitor<AtomicBoolean>() {
-            @Nullable
+
             @Override
-            public J visit(@Nullable Tree tree, AtomicBoolean found) {
+            public @Nullable J visit(@Nullable Tree tree, AtomicBoolean found) {
                 if (found.get()) {
                     return (J) tree;
                 }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/InvertCondition.java b/rewrite-java/src/main/java/org/openrewrite/java/InvertCondition.java
index 7df063a649b..ed89e0a2b45 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/InvertCondition.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/InvertCondition.java
@@ -35,9 +35,8 @@ public static <J2 extends J> J.ControlParentheses<J2> invert(J.ControlParenthese
                 .visit(controlParentheses, new InMemoryExecutionContext(), cursor.getParentOrThrow());
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, ExecutionContext ctx) {
+    public @Nullable J visit(@Nullable Tree tree, ExecutionContext ctx) {
         J t;
         if (tree instanceof Expression && !(tree instanceof J.ControlParentheses) && !(tree instanceof J.Binary)) {
             Expression expression = (Expression) tree;
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaTypeVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaTypeVisitor.java
index c2e17422013..d33f27ef6fa 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/JavaTypeVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/JavaTypeVisitor.java
@@ -38,13 +38,11 @@ public void setCursor(Cursor cursor) {
         return ListUtils.map(javaTypes, jt -> (JT) visit(jt, p));
     }
 
-    @Nullable
-    public JavaType preVisit(JavaType javaType, P p) {
+    public @Nullable JavaType preVisit(JavaType javaType, P p) {
         return javaType;
     }
 
-    @Nullable
-    public JavaType postVisit(JavaType javaType, P p) {
+    public @Nullable JavaType postVisit(JavaType javaType, P p) {
         return javaType;
     }
 
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaUnrestrictedClassLoader.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaUnrestrictedClassLoader.java
index 07f917bce4f..094746873d2 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/JavaUnrestrictedClassLoader.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/JavaUnrestrictedClassLoader.java
@@ -95,8 +95,7 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
     }
 
     @Override
-    @Nullable
-    public URL getResource(String name) {
+    public @Nullable URL getResource(String name) {
         try {
             for (Path path : modules) {
                 Path classFile = path.resolve(name);
@@ -110,8 +109,7 @@ public URL getResource(String name) {
         return super.getResource(name);
     }
 
-    @Nullable
-    private Class<?> loadIsolatedClass(String className) {
+    private @Nullable Class<?> loadIsolatedClass(String className) {
         if (!className.startsWith("org.openrewrite.java.isolated")) {
             return null;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavaVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/JavaVisitor.java
index 4bf3570efaa..22686c66c9b 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/JavaVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/JavaVisitor.java
@@ -198,8 +198,7 @@ public Space visitSpace(Space space, Space.Location loc, P p) {
         }));
     }
 
-    @Nullable
-    public JavaType visitType(@Nullable JavaType javaType, P p) {
+    public @Nullable JavaType visitType(@Nullable JavaType javaType, P p) {
         return javaType;
     }
 
@@ -207,18 +206,15 @@ public <N extends NameTree> N visitTypeName(N nameTree, P p) {
         return nameTree;
     }
 
-    @Nullable
-    private <N extends NameTree> JLeftPadded<N> visitTypeName(@Nullable JLeftPadded<N> nameTree, P p) {
+    private <N extends NameTree> @Nullable JLeftPadded<N> visitTypeName(@Nullable JLeftPadded<N> nameTree, P p) {
         return nameTree == null ? null : nameTree.withElement(visitTypeName(nameTree.getElement(), p));
     }
 
-    @Nullable
-    private <N extends NameTree> JRightPadded<N> visitTypeName(@Nullable JRightPadded<N> nameTree, P p) {
+    private <N extends NameTree> @Nullable JRightPadded<N> visitTypeName(@Nullable JRightPadded<N> nameTree, P p) {
         return nameTree == null ? null : nameTree.withElement(visitTypeName(nameTree.getElement(), p));
     }
 
-    @Nullable
-    private <J2 extends J> JContainer<J2> visitTypeNames(@Nullable JContainer<J2> nameTrees, P p) {
+    private <J2 extends J> @Nullable JContainer<J2> visitTypeNames(@Nullable JContainer<J2> nameTrees, P p) {
         if (nameTrees == null) {
             return null;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/JavadocVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/JavadocVisitor.java
index 9fe2a0fa794..55936cd1ba6 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/JavadocVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/JavadocVisitor.java
@@ -33,8 +33,7 @@ public JavadocVisitor(JavaVisitor<P> javaVisitor) {
         this.javaVisitor = javaVisitor;
     }
 
-    @Nullable
-    protected J javaVisitorVisit(@Nullable Tree tree, P p) {
+    protected @Nullable J javaVisitorVisit(@Nullable Tree tree, P p) {
         Cursor previous = javaVisitor.getCursor();
         J j = javaVisitor.visit(tree, p, getCursor());
         javaVisitor.setCursor(previous);
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/MethodMatcher.java b/rewrite-java/src/main/java/org/openrewrite/java/MethodMatcher.java
index b7dba0d17b8..1379246b65d 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/MethodMatcher.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/MethodMatcher.java
@@ -295,8 +295,7 @@ public boolean matches(J.MethodDeclaration method, J.NewClass enclosing) {
         return matchesParameterTypes(parameterTypes);
     }
 
-    @Nullable
-    private static JavaType variableDeclarationsType(Statement v) {
+    private static @Nullable JavaType variableDeclarationsType(Statement v) {
         if (v instanceof J.VariableDeclarations) {
             J.VariableDeclarations vd = (J.VariableDeclarations) v;
             List<J.VariableDeclarations.NamedVariable> variables = vd.getVariables();
@@ -397,8 +396,7 @@ public boolean isFullyQualifiedClassReference(J.FieldAccess fieldAccess) {
         return false;
     }
 
-    @Nullable
-    private static String typePattern(JavaType type) {
+    private static @Nullable String typePattern(JavaType type) {
         if (type instanceof JavaType.Primitive) {
             if (type.equals(JavaType.Primitive.String)) {
                 return ((JavaType.Primitive) type).getClassName();
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/RandomizeIdVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/RandomizeIdVisitor.java
index 9a28994e9e9..a783a5d1489 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/RandomizeIdVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/RandomizeIdVisitor.java
@@ -21,9 +21,9 @@
 import static org.openrewrite.Tree.randomId;
 
 public class RandomizeIdVisitor<P> extends JavaIsoVisitor<P> {
-    @Nullable
+
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         return tree.withId(randomId());
     }
 }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/RenameVariable.java b/rewrite-java/src/main/java/org/openrewrite/java/RenameVariable.java
index b7c98f77923..5cfef32c89b 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/RenameVariable.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/RenameVariable.java
@@ -175,8 +175,7 @@ private boolean fieldAccessTargetsVariable(J.FieldAccess fieldAccess) {
             return false;
         }
 
-        @Nullable
-        private Expression getTarget(J.FieldAccess fieldAccess) {
+        private @Nullable Expression getTarget(J.FieldAccess fieldAccess) {
             Expression target = fieldAccess.getTarget();
             if (target instanceof J.Identifier) {
                 return target;
@@ -194,8 +193,7 @@ private Expression getTarget(J.FieldAccess fieldAccess) {
             return null;
         }
 
-        @Nullable
-        private JavaType resolveType(@Nullable JavaType type) {
+        private @Nullable JavaType resolveType(@Nullable JavaType type) {
             return type instanceof JavaType.Parameterized ? ((JavaType.Parameterized) type).getType() : type;
         }
 
@@ -232,9 +230,8 @@ public J.Try.Catch visitCatch(J.Try.Catch _catch, P p) {
             return super.visitCatch(_catch, p);
         }
 
-        @Nullable
         @Override
-        public J postVisit(J tree, P p) {
+        public @Nullable J postVisit(J tree, P p) {
             maybeChangeNameScope(tree);
             return super.postVisit(tree, p);
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ReplaceStringLiteralWithConstant.java b/rewrite-java/src/main/java/org/openrewrite/java/ReplaceStringLiteralWithConstant.java
index 604ca0a2610..bb5c8c2bcd4 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/ReplaceStringLiteralWithConstant.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/ReplaceStringLiteralWithConstant.java
@@ -69,8 +69,7 @@ public String getDescription() {
         return "Replace String literal with constant, adding import on class if needed.";
     }
 
-    @Nullable
-    public String getLiteralValue() {
+    public @Nullable String getLiteralValue() {
         if (this.literalValue == null && this.fullyQualifiedConstantName != null) {
             try {
                 this.literalValue = (String) getConstantValueByFullyQualifiedName(this.fullyQualifiedConstantName);
@@ -151,8 +150,7 @@ public J visitLiteral(J.Literal literal, ExecutionContext ctx) {
         }
     }
 
-    @Nullable
-    private static Object getConstantValueByFullyQualifiedName(String fullyQualifiedConstantName) throws ClassNotFoundException, IllegalAccessException, NoSuchFieldException {
+    private static @Nullable Object getConstantValueByFullyQualifiedName(String fullyQualifiedConstantName) throws ClassNotFoundException, IllegalAccessException, NoSuchFieldException {
         String owningType = fullyQualifiedConstantName.substring(0, fullyQualifiedConstantName.lastIndexOf('.'));
         String constantName = fullyQualifiedConstantName.substring(fullyQualifiedConstantName.lastIndexOf('.') + 1);
         Field constantField = Class.forName(owningType).getField(constantName);
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/BlankLinesVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/BlankLinesVisitor.java
index 378c49613d6..7f069f0432e 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/format/BlankLinesVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/format/BlankLinesVisitor.java
@@ -324,9 +324,8 @@ private static int getNewLineCount(String whitespace) {
         return newLineCount;
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/MinimumViableSpacingVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/MinimumViableSpacingVisitor.java
index 9ab6b5bbc80..5348b55dd17 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/format/MinimumViableSpacingVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/format/MinimumViableSpacingVisitor.java
@@ -211,18 +211,16 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
         return v;
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeFormatVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeFormatVisitor.java
index c4f6a17f971..e4f32490d76 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeFormatVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeFormatVisitor.java
@@ -175,18 +175,16 @@ public Javadoc visitLineBreak(Javadoc.LineBreak lineBreak, Integer integer) {
                 .withComments(comments));
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeLineBreaksVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeLineBreaksVisitor.java
index 4ac95c1f162..80393ef5690 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeLineBreaksVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeLineBreaksVisitor.java
@@ -90,9 +90,8 @@ public J postVisit(J tree, P p) {
         return tree;
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeTabsOrSpacesVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeTabsOrSpacesVisitor.java
index 01b916751e6..bda8e34f1aa 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeTabsOrSpacesVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/format/NormalizeTabsOrSpacesVisitor.java
@@ -122,18 +122,16 @@ private String normalize(String text, boolean isComment) {
         return text;
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/RemoveTrailingWhitespaceVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/RemoveTrailingWhitespaceVisitor.java
index 77651a80a81..6fa602bd29f 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/format/RemoveTrailingWhitespaceVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/format/RemoveTrailingWhitespaceVisitor.java
@@ -72,18 +72,16 @@ public Space visitSpace(Space space, Space.Location loc, P p) {
         return s;
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/SpacesVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/SpacesVisitor.java
index 449bc3e0bf4..870a60c2cb6 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/format/SpacesVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/format/SpacesVisitor.java
@@ -1111,18 +1111,16 @@ public J.TypeParameter visitTypeParameter(J.TypeParameter typeParam, P p) {
         return tp;
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java
index 268a9d3258e..0a93390ddf9 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/format/TabsAndIndentsVisitor.java
@@ -43,8 +43,7 @@ public TabsAndIndentsVisitor(TabsAndIndentsStyle style, @Nullable Tree stopAfter
     }
 
     @Override
-    @Nullable
-    public J visit(@Nullable Tree tree, P p, Cursor parent) {
+    public @Nullable J visit(@Nullable Tree tree, P p, Cursor parent) {
         setCursor(parent);
         for (Cursor c = parent; c != null; c = c.getParent()) {
             Object v = c.getValue();
@@ -76,8 +75,7 @@ public J visit(@Nullable Tree tree, P p, Cursor parent) {
     }
 
     @Override
-    @Nullable
-    public J preVisit(@Nullable J tree, P p) {
+    public @Nullable J preVisit(@Nullable J tree, P p) {
         if (tree instanceof JavaSourceFile ||
                 tree instanceof J.Package ||
                 tree instanceof J.Import ||
@@ -619,18 +617,16 @@ private int forInitColumn() {
         throw new IllegalStateException("For loops must have a control section");
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/format/WrappingAndBracesVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/format/WrappingAndBracesVisitor.java
index c88d288db0a..ef0af0a07d8 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/format/WrappingAndBracesVisitor.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/format/WrappingAndBracesVisitor.java
@@ -195,18 +195,16 @@ private List<J.Modifier> withNewline(List<J.Modifier> modifiers) {
         return modifiers;
     }
 
-    @Nullable
     @Override
-    public J postVisit(J tree, P p) {
+    public @Nullable J postVisit(J tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(JavaSourceFile.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public J visit(@Nullable Tree tree, P p) {
+    public @Nullable J visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (J) tree;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/JavaReflectionTypeMapping.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/JavaReflectionTypeMapping.java
index c7a672b3295..beec070d921 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/JavaReflectionTypeMapping.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/JavaReflectionTypeMapping.java
@@ -248,8 +248,7 @@ private JavaType.GenericTypeVariable generic(WildcardType wildcard, String signa
         return gtv;
     }
 
-    @Nullable
-    private List<JavaType> genericBounds(Type[] bounds) {
+    private @Nullable List<JavaType> genericBounds(Type[] bounds) {
         List<JavaType> mappedBounds = null;
 
         for (Type bound : bounds) {
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/JavaTypeCache.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/JavaTypeCache.java
index bf10a2a2962..32cd3512569 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/JavaTypeCache.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/JavaTypeCache.java
@@ -39,8 +39,7 @@ private static class BytesKey {
 
     Map<Object, Object> typeCache = new HashMap<>();
 
-    @Nullable
-    public <T> T get(String signature) {
+    public <T> @Nullable T get(String signature) {
         //noinspection unchecked
         return (T) typeCache.get(key(signature));
     }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/AnnotationTemplateGenerator.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/AnnotationTemplateGenerator.java
index 85be53d01dd..9c91693ce8a 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/AnnotationTemplateGenerator.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/AnnotationTemplateGenerator.java
@@ -93,8 +93,8 @@ public List<J.Annotation> listAnnotations(JavaSourceFile cu) {
         List<J.Annotation> annotations = new ArrayList<>();
 
         new JavaIsoVisitor<Integer>() {
-            @Nullable
-            private Comment filterTemplateComment(Comment comment) {
+
+            private @Nullable Comment filterTemplateComment(Comment comment) {
                 return comment instanceof TextComment && ((TextComment) comment).getText().equals(TEMPLATE_COMMENT) ?
                         null : comment;
             }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/BlockStatementTemplateGenerator.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/BlockStatementTemplateGenerator.java
index 5a8644abb80..1711a302563 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/BlockStatementTemplateGenerator.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/BlockStatementTemplateGenerator.java
@@ -131,9 +131,8 @@ public <T> JLeftPadded<T> visitLeftPadded(@Nullable JLeftPadded<T> left, JLeftPa
                 return left;
             }
 
-            @Nullable
             @Override
-            public J visit(@Nullable Tree tree, Integer p) {
+            public @Nullable J visit(@Nullable Tree tree, Integer p) {
                 if (done) {
                     return (J) tree;
                 }
@@ -744,8 +743,7 @@ private static boolean referToSameElement(@Nullable Tree t1, @Nullable Tree t2)
      * Accepts a @FunctionalInterface and returns the single abstract method from it, or null if the single abstract
      * method cannot be found
      */
-    @Nullable
-    private static JavaType.Method findSingleAbstractMethod(@Nullable JavaType javaType) {
+    private static @Nullable JavaType.Method findSingleAbstractMethod(@Nullable JavaType javaType) {
         if (javaType == null) {
             return null;
         }
@@ -759,8 +757,7 @@ private static JavaType.Method findSingleAbstractMethod(@Nullable JavaType javaT
     // Visitor for removing any trees having or following the `STOP_COMMENT`
     private static class TemplatedTreeTrimmer {
 
-        @Nullable
-        static J trimTree(J j) {
+        static @Nullable J trimTree(J j) {
             J trimmed = new TemplatedTreeTrimmerVisitor().visit(j, 0);
             if (trimmed == null || trimmed.getMarkers().findFirst(RemoveTreeMarker.class).isPresent()) {
                 return null;
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/PatternVariables.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/PatternVariables.java
index a7990897031..c79675055b6 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/PatternVariables.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/PatternVariables.java
@@ -34,8 +34,7 @@ private static class ResultCollector {
         boolean instanceOfFound;
     }
 
-    @Nullable
-    static String simplifiedPatternVariableCondition(Expression condition, @Nullable J toReplace) {
+    static @Nullable String simplifiedPatternVariableCondition(Expression condition, @Nullable J toReplace) {
         ResultCollector resultCollector = new ResultCollector();
         simplifiedPatternVariableCondition0(condition, toReplace, resultCollector);
         return resultCollector.instanceOfFound ? resultCollector.builder.toString() : null;
@@ -277,8 +276,7 @@ private static boolean neverCompletesNormallyIgnoringLabel(@Nullable Statement s
         }
     }
 
-    @Nullable
-    private static Statement getLastStatement(Statement statement) {
+    private static @Nullable Statement getLastStatement(Statement statement) {
         if (statement instanceof J.Block) {
             List<Statement> statements = ((J.Block) statement).getStatements();
             return statements.isEmpty() ? null : getLastStatement(statements.get(statements.size() - 1));
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/Substitutions.java b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/Substitutions.java
index 1afdf93dce2..27460dfeab4 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/internal/template/Substitutions.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/internal/template/Substitutions.java
@@ -289,8 +289,7 @@ public J visitLiteral(J.Literal literal, Integer integer) {
                 return super.visitLiteral(literal, integer);
             }
 
-            @Nullable
-            private J maybeParameter(J j) {
+            private @Nullable J maybeParameter(J j) {
                 Integer param = parameterIndex(j.getPrefix());
                 if (param != null) {
                     J j2 = (J) parameters[param];
@@ -299,8 +298,7 @@ private J maybeParameter(J j) {
                 return null;
             }
 
-            @Nullable
-            private Integer parameterIndex(Space space) {
+            private @Nullable Integer parameterIndex(Space space) {
                 for (Comment comment : space.getComments()) {
                     if (comment instanceof TextComment) {
                         Matcher matcher = PATTERN_COMMENT.matcher(((TextComment) comment).getText());
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/marker/JavaSourceSet.java b/rewrite-java/src/main/java/org/openrewrite/java/marker/JavaSourceSet.java
index 8093e83b5e9..08337429d70 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/marker/JavaSourceSet.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/marker/JavaSourceSet.java
@@ -133,8 +133,7 @@ private static List<JavaType.FullyQualified> typesFrom(List<String> typeNames) {
      * This method takes all of these considerations into account and returns a fully qualified name which replaces
      * inner-class signifying "$" with ".", while preserving
      */
-    @Nullable
-    private static String declarableFullyQualifiedName(ClassInfo classInfo) {
+    private static @Nullable String declarableFullyQualifiedName(ClassInfo classInfo) {
         String name;
         if (classInfo.getName().startsWith("java.") && !classInfo.isPublic()) {
             // Because we put java-supplied types into another package, we cannot access package-private types
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/search/SemanticallyEqual.java b/rewrite-java/src/main/java/org/openrewrite/java/search/SemanticallyEqual.java
index 1fa70ed3fee..76040a58404 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/search/SemanticallyEqual.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/search/SemanticallyEqual.java
@@ -110,8 +110,7 @@ protected void visitList(@Nullable List<? extends J> list1, @Nullable List<? ext
             return super.visit(unwrap(tree), unwrap(j));
         }
 
-        @Nullable
-        private static J unwrap(@Nullable Tree tree) {
+        private static @Nullable J unwrap(@Nullable Tree tree) {
             if (tree instanceof Expression) {
                 tree = ((Expression) tree).unwrap();
             }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java b/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java
index a6cd6108426..2398a8ff452 100755
--- a/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/style/CheckstyleConfigLoader.java
@@ -83,8 +83,7 @@ public static Checkstyle loadCheckstyleConfig(InputStream checkstyleConf, Map<St
                         .collect(toSet()));
     }
 
-    @Nullable
-    private static Set<DefaultComesLastStyle> defaultComesLast(Map<String, List<Module>> conf) {
+    private static @Nullable Set<DefaultComesLastStyle> defaultComesLast(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("DefaultComesLast");
         if (moduleList == null) {
             return null;
@@ -94,8 +93,7 @@ private static Set<DefaultComesLastStyle> defaultComesLast(Map<String, List<Modu
                 .collect(Collectors.toSet());
     }
 
-    @Nullable
-    private static Set<EmptyBlockStyle> emptyBlock(Map<String, List<Module>> conf) {
+    private static @Nullable Set<EmptyBlockStyle> emptyBlock(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("EmptyBlock");
         if (moduleList == null) {
             return null;
@@ -144,8 +142,7 @@ private static Set<EmptyBlockStyle> emptyBlock(Map<String, List<Module>> conf) {
                 .collect(Collectors.toSet());
     }
 
-    @Nullable
-    private static Set<EmptyForInitializerPadStyle> emptyForInitializerPadStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<EmptyForInitializerPadStyle> emptyForInitializerPadStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("EmptyForInitializerPad");
         if (moduleList == null) {
             return null;
@@ -160,8 +157,7 @@ private static Set<EmptyForInitializerPadStyle> emptyForInitializerPadStyle(Map<
                 .collect(Collectors.toSet());
     }
 
-    @Nullable
-    private static Set<EmptyForIteratorPadStyle> emptyForIteratorPadStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<EmptyForIteratorPadStyle> emptyForIteratorPadStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("EmptyForIteratorPad");
         if (moduleList == null) {
             return null;
@@ -176,8 +172,7 @@ private static Set<EmptyForIteratorPadStyle> emptyForIteratorPadStyle(Map<String
                 .collect(toSet());
     }
 
-    @Nullable
-    private static Set<EqualsAvoidsNullStyle> equalsAvoidsNull(Map<String, List<Module>> conf) {
+    private static @Nullable Set<EqualsAvoidsNullStyle> equalsAvoidsNull(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("EqualsAvoidNull");
         if (moduleList == null) {
             return null;
@@ -187,9 +182,7 @@ private static Set<EqualsAvoidsNullStyle> equalsAvoidsNull(Map<String, List<Modu
                 .collect(toSet());
     }
 
-
-    @Nullable
-    private static Set<FallThroughStyle> fallThrough(Map<String, List<Module>> conf) {
+    private static @Nullable Set<FallThroughStyle> fallThrough(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("FallThrough");
         if (moduleList == null) {
             return null;
@@ -199,8 +192,7 @@ private static Set<FallThroughStyle> fallThrough(Map<String, List<Module>> conf)
                 .collect(toSet());
     }
 
-    @Nullable
-    private static Set<HiddenFieldStyle> hiddenFieldStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<HiddenFieldStyle> hiddenFieldStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("HiddenField");
         if (moduleList == null) {
             return null;
@@ -215,8 +207,7 @@ private static Set<HiddenFieldStyle> hiddenFieldStyle(Map<String, List<Module>>
                 .collect(toSet());
     }
 
-    @Nullable
-    private static Set<MethodParamPadStyle> methodParamPadStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<MethodParamPadStyle> methodParamPadStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("MethodParamPad");
         if (moduleList == null) {
             return null;
@@ -234,8 +225,7 @@ private static Set<MethodParamPadStyle> methodParamPadStyle(Map<String, List<Mod
                 .collect(toSet());
     }
 
-    @Nullable
-    private static Set<NeedBracesStyle> needBracesStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<NeedBracesStyle> needBracesStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("NeedBraces");
         if (moduleList == null) {
             return null;
@@ -248,8 +238,7 @@ private static Set<NeedBracesStyle> needBracesStyle(Map<String, List<Module>> co
                 .collect(toSet());
     }
 
-    @Nullable
-    private static Set<NoWhitespaceAfterStyle> noWhitespaceAfterStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<NoWhitespaceAfterStyle> noWhitespaceAfterStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("NoWhitespaceAfter");
         if (moduleList == null) {
             return null;
@@ -307,8 +296,7 @@ private static Set<NoWhitespaceAfterStyle> noWhitespaceAfterStyle(Map<String, Li
                 .collect(toSet());
     }
 
-    @Nullable
-    private static Set<NoWhitespaceBeforeStyle> noWhitespaceBeforeStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<NoWhitespaceBeforeStyle> noWhitespaceBeforeStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("NoWhitespaceBefore");
         if (moduleList == null) {
             return null;
@@ -352,8 +340,7 @@ private static Set<NoWhitespaceBeforeStyle> noWhitespaceBeforeStyle(Map<String,
                 .collect(toSet());
     }
 
-    @Nullable
-    private static Set<OperatorWrapStyle> operatorWrapStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<OperatorWrapStyle> operatorWrapStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("OperatorWrap");
         if (moduleList == null) {
             return null;
@@ -451,8 +438,7 @@ private static Set<OperatorWrapStyle> operatorWrapStyle(Map<String, List<Module>
                 .collect(toSet());
     }
 
-    @Nullable
-    private static Set<TypecastParenPadStyle> typecastParenPadStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<TypecastParenPadStyle> typecastParenPadStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("TypecastParenPad");
         if (moduleList == null) {
             return null;
@@ -468,8 +454,7 @@ private static Set<TypecastParenPadStyle> typecastParenPadStyle(Map<String, List
     }
 
     @SuppressWarnings("DuplicatedCode")
-    @Nullable
-    private static Set<UnnecessaryParenthesesStyle> unnecessaryParentheses(Map<String, List<Module>> conf) {
+    private static @Nullable Set<UnnecessaryParenthesesStyle> unnecessaryParentheses(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("UnnecessaryParentheses");
         if (moduleList == null) {
             return null;
@@ -536,8 +521,7 @@ private static Set<UnnecessaryParenthesesStyle> unnecessaryParentheses(Map<Strin
                 .collect(Collectors.toSet());
     }
 
-    @Nullable
-    private static Set<HideUtilityClassConstructorStyle> hideUtilityClassConstructorStyle(Map<String, List<Module>> conf) {
+    private static @Nullable Set<HideUtilityClassConstructorStyle> hideUtilityClassConstructorStyle(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("HiddenField");
         if (moduleList == null) {
             return null;
@@ -579,9 +563,7 @@ public String toString() {
         }
     }
 
-
-    @Nullable
-    private static Set<ExplicitInitializationStyle> explicitInitialization(Map<String, List<Module>> conf) {
+    private static @Nullable Set<ExplicitInitializationStyle> explicitInitialization(Map<String, List<Module>> conf) {
         List<Module> moduleList = conf.get("ExplicitInitialization");
         if (moduleList == null) {
             return null;
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/trait/VariableAccess.java b/rewrite-java/src/main/java/org/openrewrite/java/trait/VariableAccess.java
index 129749b3744..4710fbebe0f 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/trait/VariableAccess.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/trait/VariableAccess.java
@@ -111,9 +111,8 @@ public Stream<VariableAccess> higher(Cursor cursor) {
             return Stream.empty();
         }
 
-        @Nullable
         @Override
-        protected VariableAccess test(Cursor cursor) {
+        protected @Nullable VariableAccess test(Cursor cursor) {
             if (!(cursor.getValue() instanceof J.Identifier)) {
                 return null;
             }
@@ -177,8 +176,7 @@ protected VariableAccess test(Cursor cursor) {
             return null;
         }
 
-        @Nullable
-        private VariableAccess checkFilters(Cursor cursor) {
+        private @Nullable VariableAccess checkFilters(Cursor cursor) {
             return typeTest.test(cursor.<J.Identifier>getValue().getType()) ?
                     new VariableAccess(cursor) :
                     null;
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/Expression.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/Expression.java
index c5af1209a9c..a65b5b5d051 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/Expression.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/Expression.java
@@ -48,8 +48,7 @@ default Expression unwrap() {
         return requireNonNull(unwrap(this));
     }
 
-    @Nullable
-    static Expression unwrap(@Nullable Expression expr) {
+    static @Nullable Expression unwrap(@Nullable Expression expr) {
         if (expr instanceof J.Parentheses<?> && ((J.Parentheses<?>) expr).getTree() instanceof Expression) {
             return ((Expression) ((J.Parentheses<?>) expr).getTree()).unwrap();
         } else {
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 6c7af64f435..4aea20dc7b5 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
@@ -64,8 +64,7 @@ default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
         return v.isAdaptableTo(JavaVisitor.class);
     }
 
-    @Nullable
-    default <P> J acceptJava(JavaVisitor<P> v, P p) {
+    default <P> @Nullable J acceptJava(JavaVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
@@ -210,8 +209,7 @@ public String getSimpleName() {
         @Nullable
         JContainer<Expression> arguments;
 
-        @Nullable
-        public List<Expression> getArguments() {
+        public @Nullable List<Expression> getArguments() {
             return arguments == null ? null : arguments.getElements();
         }
 
@@ -265,8 +263,7 @@ public String toString() {
         public static class Padding {
             private final Annotation t;
 
-            @Nullable
-            public JContainer<Expression> getArguments() {
+            public @Nullable JContainer<Expression> getArguments() {
                 return t.arguments;
             }
 
@@ -1063,8 +1060,7 @@ public Case withStatements(List<Statement> statements) {
         @Nullable
         JRightPadded<J> body;
 
-        @Nullable
-        public J getBody() {
+        public @Nullable J getBody() {
             return body == null ? null : body.getElement();
         }
 
@@ -1127,8 +1123,7 @@ public enum Type {
         public static class Padding {
             private final Case t;
 
-            @Nullable
-            public JRightPadded<J> getBody() {
+            public @Nullable JRightPadded<J> getBody() {
                 return t.body;
             }
 
@@ -1206,8 +1201,7 @@ public ClassDeclaration withKind(Kind.Type type) {
         @Nullable
         JContainer<TypeParameter> typeParameters;
 
-        @Nullable
-        public List<TypeParameter> getTypeParameters() {
+        public @Nullable List<TypeParameter> getTypeParameters() {
             return typeParameters == null ? null : typeParameters.getElements();
         }
 
@@ -1218,8 +1212,7 @@ public ClassDeclaration withTypeParameters(@Nullable List<TypeParameter> typePar
         @Nullable
         JContainer<Statement> primaryConstructor;
 
-        @Nullable
-        public List<Statement> getPrimaryConstructor() {
+        public @Nullable List<Statement> getPrimaryConstructor() {
             return primaryConstructor == null ? null : primaryConstructor.getElements();
         }
 
@@ -1230,8 +1223,7 @@ public ClassDeclaration withPrimaryConstructor(@Nullable List<Statement> primary
         @Nullable
         JLeftPadded<TypeTree> extendings;
 
-        @Nullable
-        public TypeTree getExtends() {
+        public @Nullable TypeTree getExtends() {
             return extendings == null ? null : extendings.getElement();
         }
 
@@ -1242,8 +1234,7 @@ public ClassDeclaration withExtends(@Nullable TypeTree extendings) {
         @Nullable
         JContainer<TypeTree> implementings;
 
-        @Nullable
-        public List<TypeTree> getImplements() {
+        public @Nullable List<TypeTree> getImplements() {
             return implementings == null ? null : implementings.getElements();
         }
 
@@ -1254,8 +1245,7 @@ public ClassDeclaration withImplements(@Nullable List<TypeTree> implementings) {
         @Nullable
         JContainer<TypeTree> permitting;
 
-        @Nullable
-        public List<TypeTree> getPermits() {
+        public @Nullable List<TypeTree> getPermits() {
             return permitting == null ? null : permitting.getElements();
         }
 
@@ -1368,8 +1358,7 @@ public Padding getPadding() {
         public static class Padding {
             private final ClassDeclaration t;
 
-            @Nullable
-            public JContainer<Statement> getPrimaryConstructor() {
+            public @Nullable JContainer<Statement> getPrimaryConstructor() {
                 return t.primaryConstructor;
             }
 
@@ -1377,8 +1366,7 @@ public ClassDeclaration withPrimaryConstructor(@Nullable JContainer<Statement> p
                 return t.primaryConstructor == primaryConstructor ? t : new ClassDeclaration(t.id, t.prefix, t.markers, t.leadingAnnotations, t.modifiers, t.kind, t.name, t.typeParameters, primaryConstructor, t.extendings, t.implementings, t.permitting, t.body, t.type);
             }
 
-            @Nullable
-            public JLeftPadded<TypeTree> getExtends() {
+            public @Nullable JLeftPadded<TypeTree> getExtends() {
                 return t.extendings;
             }
 
@@ -1386,8 +1374,7 @@ public ClassDeclaration withExtends(@Nullable JLeftPadded<TypeTree> extendings)
                 return t.extendings == extendings ? t : new ClassDeclaration(t.id, t.prefix, t.markers, t.leadingAnnotations, t.modifiers, t.kind, t.name, t.typeParameters, t.primaryConstructor, extendings, t.implementings, t.permitting, t.body, t.type);
             }
 
-            @Nullable
-            public JContainer<TypeTree> getImplements() {
+            public @Nullable JContainer<TypeTree> getImplements() {
                 return t.implementings;
             }
 
@@ -1395,8 +1382,7 @@ public ClassDeclaration withImplements(@Nullable JContainer<TypeTree> implementi
                 return t.implementings == implementings ? t : new ClassDeclaration(t.id, t.prefix, t.markers, t.leadingAnnotations, t.modifiers, t.kind, t.name, t.typeParameters, t.primaryConstructor, t.extendings, implementings, t.permitting, t.body, t.type);
             }
 
-            @Nullable
-            public JContainer<TypeTree> getPermits() {
+            public @Nullable JContainer<TypeTree> getPermits() {
                 return t.permitting;
             }
 
@@ -1412,8 +1398,7 @@ public ClassDeclaration withKind(Kind kind) {
                 return t.kind == kind ? t : new ClassDeclaration(t.id, t.prefix, t.markers, t.leadingAnnotations, t.modifiers, kind, t.name, t.typeParameters, t.primaryConstructor, t.extendings, t.implementings, t.permitting, t.body, t.type);
             }
 
-            @Nullable
-            public JContainer<TypeParameter> getTypeParameters() {
+            public @Nullable JContainer<TypeParameter> getTypeParameters() {
                 return t.typeParameters;
             }
 
@@ -1485,9 +1470,8 @@ public SourceFile withCharset(Charset charset) {
         @Nullable
         JRightPadded<Package> packageDeclaration;
 
-        @Nullable
         @Override
-        public Package getPackageDeclaration() {
+        public @Nullable Package getPackageDeclaration() {
             return packageDeclaration == null ? null : packageDeclaration.getElement();
         }
 
@@ -1615,8 +1599,7 @@ public Padding getPadding() {
         public static class Padding implements JavaSourceFile.Padding {
             private final CompilationUnit t;
 
-            @Nullable
-            public JRightPadded<Package> getPackageDeclaration() {
+            public @Nullable JRightPadded<Package> getPackageDeclaration() {
                 return t.packageDeclaration;
             }
 
@@ -1976,8 +1959,7 @@ public List<J> getSideEffects() {
          * @return For expressions like {@code String.class}, this casts target expression to a {@link NameTree}.
          * If the field access is not a reference to a class type, returns null.
          */
-        @Nullable
-        public NameTree asClassReference() {
+        public @Nullable NameTree asClassReference() {
             if (target instanceof NameTree) {
                 String fqn = null;
                 if (type instanceof JavaType.FullyQualified) {
@@ -2693,8 +2675,7 @@ public Import withStatic(boolean statik) {
             return getPadding().withStatic(this.statik.withElement(statik));
         }
 
-        @Nullable
-        public J.Identifier getAlias() {
+        public @Nullable J.Identifier getAlias() {
             if (alias == null) {
                 return null;
             }
@@ -2868,8 +2849,7 @@ public Import withStatic(JLeftPadded<Boolean> statik) {
                 return t.statik == statik ? t : new Import(t.id, t.prefix, t.markers, statik, t.qualid, t.alias);
             }
 
-            @Nullable
-            public JLeftPadded<J.Identifier> getAlias() {
+            public @Nullable JLeftPadded<J.Identifier> getAlias() {
                 return t.alias;
             }
 
@@ -3073,8 +3053,7 @@ public Padding getPadding() {
         public static class Padding {
             private final IntersectionType t;
 
-            @Nullable
-            public JContainer<TypeTree> getBounds() {
+            public @Nullable JContainer<TypeTree> getBounds() {
                 return t.bounds;
             }
 
@@ -3419,8 +3398,7 @@ public MemberReference withContaining(Expression containing) {
         @Nullable
         JContainer<Expression> typeParameters;
 
-        @Nullable
-        public List<Expression> getTypeParameters() {
+        public @Nullable List<Expression> getTypeParameters() {
             return typeParameters == null ? null : typeParameters.getElements();
         }
 
@@ -3516,8 +3494,7 @@ public MemberReference withContaining(JRightPadded<Expression> containing) {
                 return t.containing == containing ? t : new MemberReference(t.id, t.prefix, t.markers, containing, t.typeParameters, t.reference, t.type, t.methodType, t.variableType);
             }
 
-            @Nullable
-            public JContainer<Expression> getTypeParameters() {
+            public @Nullable JContainer<Expression> getTypeParameters() {
                 return t.typeParameters;
             }
 
@@ -3572,8 +3549,7 @@ final class MethodDeclaration implements J, Statement, TypedTree {
         @Nullable
         TypeParameters typeParameters;
 
-        @Nullable
-        public List<TypeParameter> getTypeParameters() {
+        public @Nullable List<TypeParameter> getTypeParameters() {
             return typeParameters == null ? null : typeParameters.getTypeParameters();
         }
 
@@ -3627,8 +3603,7 @@ public MethodDeclaration withParameters(List<Statement> parameters) {
         @Nullable
         JContainer<NameTree> throwz;
 
-        @Nullable
-        public List<NameTree> getThrows() {
+        public @Nullable List<NameTree> getThrows() {
             return throwz == null ? null : throwz.getElements();
         }
 
@@ -3650,8 +3625,7 @@ public MethodDeclaration withThrows(@Nullable List<NameTree> throwz) {
         @Nullable
         JLeftPadded<Expression> defaultValue;
 
-        @Nullable
-        public Expression getDefaultValue() {
+        public @Nullable Expression getDefaultValue() {
             return defaultValue == null ? null : defaultValue.getElement();
         }
 
@@ -3773,8 +3747,7 @@ public MethodDeclaration withParameters(JContainer<Statement> parameters) {
                 return t.parameters == parameters ? t : new MethodDeclaration(t.id, t.prefix, t.markers, t.leadingAnnotations, t.modifiers, t.typeParameters, t.returnTypeExpression, t.name, parameters, t.throwz, t.body, t.defaultValue, t.methodType);
             }
 
-            @Nullable
-            public JContainer<NameTree> getThrows() {
+            public @Nullable JContainer<NameTree> getThrows() {
                 return t.throwz;
             }
 
@@ -3782,8 +3755,7 @@ public MethodDeclaration withThrows(@Nullable JContainer<NameTree> throwz) {
                 return t.throwz == throwz ? t : new MethodDeclaration(t.id, t.prefix, t.markers, t.leadingAnnotations, t.modifiers, t.typeParameters, t.returnTypeExpression, t.name, t.parameters, throwz, t.body, t.defaultValue, t.methodType);
             }
 
-            @Nullable
-            public JLeftPadded<Expression> getDefaultValue() {
+            public @Nullable JLeftPadded<Expression> getDefaultValue() {
                 return t.defaultValue;
             }
 
@@ -3791,8 +3763,7 @@ public MethodDeclaration withDefaultValue(@Nullable JLeftPadded<Expression> defa
                 return t.defaultValue == defaultValue ? t : new MethodDeclaration(t.id, t.prefix, t.markers, t.leadingAnnotations, t.modifiers, t.typeParameters, t.returnTypeExpression, t.name, t.parameters, t.throwz, t.body, defaultValue, t.methodType);
             }
 
-            @Nullable
-            public TypeParameters getTypeParameters() {
+            public @Nullable TypeParameters getTypeParameters() {
                 return t.typeParameters;
             }
 
@@ -3820,8 +3791,7 @@ public Annotations getAnnotations() {
         public static class Annotations {
             private final MethodDeclaration t;
 
-            @Nullable
-            public TypeParameters getTypeParameters() {
+            public @Nullable TypeParameters getTypeParameters() {
                 return t.typeParameters;
             }
 
@@ -3867,8 +3837,7 @@ final class MethodInvocation implements J, Statement, Expression, TypedTree, Met
         @Nullable
         JRightPadded<Expression> select;
 
-        @Nullable
-        public Expression getSelect() {
+        public @Nullable Expression getSelect() {
             return select == null ? null : select.getElement();
         }
 
@@ -3880,8 +3849,7 @@ public MethodInvocation withSelect(@Nullable Expression select) {
         @With
         JContainer<Expression> typeParameters;
 
-        @Nullable
-        public List<Expression> getTypeParameters() {
+        public @Nullable List<Expression> getTypeParameters() {
             return typeParameters == null ? null : typeParameters.getElements();
         }
 
@@ -3953,8 +3921,7 @@ public CoordinateBuilder.MethodInvocation getCoordinates() {
         }
 
         @Override
-        @Nullable
-        public JavaType getType() {
+        public @Nullable JavaType getType() {
             return methodType == null ? null : methodType.getReturnType();
         }
 
@@ -3992,8 +3959,7 @@ public String toString() {
         public static class Padding {
             private final MethodInvocation t;
 
-            @Nullable
-            public JRightPadded<Expression> getSelect() {
+            public @Nullable JRightPadded<Expression> getSelect() {
                 return t.select;
             }
 
@@ -4001,8 +3967,7 @@ public MethodInvocation withSelect(@Nullable JRightPadded<Expression> select) {
                 return t.select == select ? t : new MethodInvocation(t.id, t.prefix, t.markers, select, t.typeParameters, t.name, t.arguments, t.methodType);
             }
 
-            @Nullable
-            public JContainer<Expression> getTypeParameters() {
+            public @Nullable JContainer<Expression> getTypeParameters() {
                 return t.typeParameters;
             }
 
@@ -4227,8 +4192,7 @@ final class NewArray implements J, Expression, TypedTree {
         @Nullable
         JContainer<Expression> initializer;
 
-        @Nullable
-        public List<Expression> getInitializer() {
+        public @Nullable List<Expression> getInitializer() {
             return initializer == null ? null : initializer.getElements();
         }
 
@@ -4271,8 +4235,7 @@ public Padding getPadding() {
         public static class Padding {
             private final NewArray t;
 
-            @Nullable
-            public JContainer<Expression> getInitializer() {
+            public @Nullable JContainer<Expression> getInitializer() {
                 return t.initializer;
             }
 
@@ -4382,8 +4345,7 @@ final class NewClass implements J, Statement, Expression, TypedTree, MethodCall
         @Nullable
         JRightPadded<Expression> enclosing;
 
-        @Nullable
-        public Expression getEnclosing() {
+        public @Nullable Expression getEnclosing() {
             return enclosing == null ? null : enclosing.getElement();
         }
 
@@ -4431,9 +4393,8 @@ public NewClass withArguments(List<Expression> arguments) {
         @Getter
         JavaType.Method constructorType;
 
-        @Nullable
         @Override
-        public JavaType getType() {
+        public @Nullable JavaType getType() {
             return constructorType == null ? null : constructorType.getReturnType();
         }
 
@@ -4442,9 +4403,8 @@ public JavaType getType() {
          *
          * @return The constructor type.
          */
-        @Nullable
         @Override
-        public JavaType.Method getMethodType() {
+        public @Nullable JavaType.Method getMethodType() {
             return getConstructorType();
         }
 
@@ -4506,8 +4466,7 @@ public String toString() {
         public static class Padding {
             private final NewClass t;
 
-            @Nullable
-            public JRightPadded<Expression> getEnclosing() {
+            public @Nullable JRightPadded<Expression> getEnclosing() {
                 return t.enclosing;
             }
 
@@ -4686,8 +4645,7 @@ final class ParameterizedType implements J, TypeTree, Expression {
         @Nullable
         JavaType type;
 
-        @Nullable
-        public List<Expression> getTypeParameters() {
+        public @Nullable List<Expression> getTypeParameters() {
             return typeParameters == null ? null : typeParameters.getElements();
         }
 
@@ -4730,8 +4688,7 @@ public String toString() {
         public static class Padding {
             private final ParameterizedType t;
 
-            @Nullable
-            public JContainer<Expression> getTypeParameters() {
+            public @Nullable JContainer<Expression> getTypeParameters() {
                 return t.typeParameters;
             }
 
@@ -5088,8 +5045,7 @@ final class SwitchExpression implements J, Expression, TypedTree {
 
         @Override
         @Transient
-        @Nullable
-        public JavaType getType() {
+        public @Nullable JavaType getType() {
             return new JavaVisitor<AtomicReference<JavaType>>() {
                 @Override
                 public J visitBlock(Block block, AtomicReference<JavaType> javaType) {
@@ -5317,8 +5273,7 @@ final class Try implements J, Statement {
         @Nullable
         JContainer<Resource> resources;
 
-        @Nullable
-        public List<Resource> getResources() {
+        public @Nullable List<Resource> getResources() {
             return resources == null ? null : resources.getElements();
         }
 
@@ -5337,8 +5292,7 @@ public Try withResources(@Nullable List<Resource> resources) {
         @Nullable
         JLeftPadded<Block> finallie;
 
-        @Nullable
-        public Block getFinally() {
+        public @Nullable Block getFinally() {
             return finallie == null ? null : finallie.getElement();
         }
 
@@ -5436,8 +5390,7 @@ public Padding getPadding() {
         public static class Padding {
             private final Try t;
 
-            @Nullable
-            public JContainer<Resource> getResources() {
+            public @Nullable JContainer<Resource> getResources() {
                 return t.resources;
             }
 
@@ -5445,8 +5398,7 @@ public Try withResources(@Nullable JContainer<Resource> resources) {
                 return t.resources == resources ? t : new Try(t.id, t.prefix, t.markers, resources, t.body, t.catches, t.finallie);
             }
 
-            @Nullable
-            public JLeftPadded<Block> getFinally() {
+            public @Nullable JLeftPadded<Block> getFinally() {
                 return t.finallie;
             }
 
@@ -5552,8 +5504,7 @@ final class TypeParameter implements J {
         @Nullable
         JContainer<TypeTree> bounds;
 
-        @Nullable
-        public List<TypeTree> getBounds() {
+        public @Nullable List<TypeTree> getBounds() {
             return bounds == null ? null : bounds.getElements();
         }
 
@@ -5585,8 +5536,7 @@ public Padding getPadding() {
         public static class Padding {
             private final TypeParameter t;
 
-            @Nullable
-            public JContainer<TypeTree> getBounds() {
+            public @Nullable JContainer<TypeTree> getBounds() {
                 return t.bounds;
             }
 
@@ -5868,14 +5818,12 @@ public List<J.Annotation> getAllAnnotations() {
             return allAnnotations;
         }
 
-        @Nullable
-        public JavaType.FullyQualified getTypeAsFullyQualified() {
+        public @Nullable JavaType.FullyQualified getTypeAsFullyQualified() {
             return typeExpression == null ? null : TypeUtils.asFullyQualified(typeExpression.getType());
         }
 
-        @Nullable
         @Override
-        public JavaType getType() {
+        public @Nullable JavaType getType() {
             return typeExpression == null ? null : typeExpression.getType();
         }
 
@@ -5924,8 +5872,7 @@ public static final class NamedVariable implements J, NameTree {
             @Nullable
             JLeftPadded<Expression> initializer;
 
-            @Nullable
-            public Expression getInitializer() {
+            public @Nullable Expression getInitializer() {
                 return initializer == null ? null : initializer.getElement();
             }
 
@@ -5999,8 +5946,7 @@ public String toString() {
             public static class Padding {
                 private final NamedVariable t;
 
-                @Nullable
-                public JLeftPadded<Expression> getInitializer() {
+                public @Nullable JLeftPadded<Expression> getInitializer() {
                     return t.initializer;
                 }
 
@@ -6148,8 +6094,7 @@ final class Wildcard implements J, Expression, TypeTree {
         @Nullable
         JLeftPadded<Bound> bound;
 
-        @Nullable
-        public Bound getBound() {
+        public @Nullable Bound getBound() {
             return bound == null ? null : bound.getElement();
         }
 
@@ -6213,8 +6158,7 @@ public String toString() {
         public static class Padding {
             private final Wildcard t;
 
-            @Nullable
-            public JLeftPadded<Bound> getBound() {
+            public @Nullable JLeftPadded<Bound> getBound() {
                 return t.bound;
             }
 
@@ -6269,9 +6213,8 @@ public <P> J acceptJava(JavaVisitor<P> v, P p) {
             return v.visitUnknown(this, p);
         }
 
-        @Nullable
         @Override
-        public JavaType getType() {
+        public @Nullable JavaType getType() {
             return null;
         }
 
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/JContainer.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/JContainer.java
index 62a80d2dd99..18554288e9f 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/JContainer.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/JContainer.java
@@ -152,8 +152,7 @@ public JContainer<T> withElements(List<JRightPadded<T>> elements) {
         }
     }
 
-    @Nullable
-    public static <J2 extends J> JContainer<J2> withElementsNullable(@Nullable JContainer<J2> before, @Nullable List<J2> elements) {
+    public static <J2 extends J> @Nullable JContainer<J2> withElementsNullable(@Nullable JContainer<J2> before, @Nullable List<J2> elements) {
         if (elements == null || elements.isEmpty()) {
             return null;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/JLeftPadded.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/JLeftPadded.java
index b3475545a2c..d0ab7411054 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/JLeftPadded.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/JLeftPadded.java
@@ -90,8 +90,7 @@ public Space.Location getBeforeLocation() {
         }
     }
 
-    @Nullable
-    public static <T> JLeftPadded<T> withElement(@Nullable JLeftPadded<T> before, @Nullable T element) {
+    public static <T> @Nullable JLeftPadded<T> withElement(@Nullable JLeftPadded<T> before, @Nullable T element) {
         if (element == null) {
             return null;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/JRightPadded.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/JRightPadded.java
index 4fcb27b18e6..d8e952b752f 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/JRightPadded.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/JRightPadded.java
@@ -111,8 +111,7 @@ public static <T> List<T> getElements(@Nullable List<JRightPadded<T>> ls) {
         return list;
     }
 
-    @Nullable
-    public static <T> JRightPadded<T> withElement(@Nullable JRightPadded<T> before, @Nullable T element) {
+    public static <T> @Nullable JRightPadded<T> withElement(@Nullable JRightPadded<T> before, @Nullable T element) {
         if (element == null) {
             return null;
         }
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaCoordinates.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaCoordinates.java
index d9e2d86ba76..019e1710132 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaCoordinates.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/JavaCoordinates.java
@@ -52,8 +52,7 @@ public enum Mode {
         REPLACEMENT
     }
 
-    @Nullable
-    public <J2 extends J> Comparator<J2> getComparator() {
+    public <J2 extends J> @Nullable Comparator<J2> getComparator() {
         //noinspection unchecked
         return (Comparator<J2>) comparator;
     }
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 21073c7f97d..38c80fb7948 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
@@ -53,8 +53,7 @@ default String getJacksonPolymorphicTypeTag() {
     }
 
     // TODO: To be removed with OpenRewrite 9
-    @Nullable
-    default Integer getManagedReference() {
+    default @Nullable Integer getManagedReference() {
         return null;
     }
 
@@ -306,11 +305,9 @@ public E next() {
             }
         }
 
-        @Nullable
-        public abstract FullyQualified getOwningClass();
+        public abstract @Nullable FullyQualified getOwningClass();
 
-        @Nullable
-        public abstract FullyQualified getSupertype();
+        public abstract @Nullable FullyQualified getSupertype();
 
         /**
          * @return The class name without package qualification. If an inner class, outer/inner classes are separated by '.'.
@@ -759,9 +756,8 @@ public List<Method> getMethods() {
             return type.getMethods();
         }
 
-        @Nullable
         @Override
-        public FullyQualified getOwningClass() {
+        public @Nullable FullyQualified getOwningClass() {
             return type.getOwningClass();
         }
 
@@ -960,8 +956,7 @@ enum Primitive implements JavaType {
         None,
         Null;
 
-        @Nullable
-        public static Primitive fromKeyword(String keyword) {
+        public static @Nullable Primitive fromKeyword(String keyword) {
             switch (keyword) {
                 case "boolean":
                     return Boolean;
@@ -991,8 +986,7 @@ public static Primitive fromKeyword(String keyword) {
             return null;
         }
 
-        @Nullable
-        public static Primitive fromClassName(String className) {
+        public static @Nullable Primitive fromClassName(String className) {
             switch (className) {
                 case "java.lang.Boolean":
                     return Boolean;
@@ -1219,8 +1213,7 @@ public FullyQualified getDeclaringType() {
             return declaringType;
         }
 
-        @Nullable
-        public JavaType.Method getOverride() {
+        public @Nullable JavaType.Method getOverride() {
             if (declaringType instanceof JavaType.Unknown) {
                 return null;
             }
@@ -1441,8 +1434,7 @@ public Variable(@Nullable Integer managedReference, long flagsBitMap, String nam
         Variable() {
         }
 
-        @Nullable
-        public JavaType getOwner() {
+        public @Nullable JavaType getOwner() {
             return owner;
         }
 
@@ -1562,15 +1554,13 @@ public List<Method> getMethods() {
             return emptyList();
         }
 
-        @Nullable
         @Override
-        public FullyQualified getOwningClass() {
+        public @Nullable FullyQualified getOwningClass() {
             return null;
         }
 
-        @Nullable
         @Override
-        public FullyQualified getSupertype() {
+        public @Nullable FullyQualified getSupertype() {
             return null;
         }
 
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 49709c37e1d..cf47f4bebcc 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
@@ -44,8 +44,7 @@ default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
         return v instanceof JavadocVisitor;
     }
 
-    @Nullable
-    default <P> Javadoc acceptJavadoc(JavadocVisitor<P> v, P p) {
+    default <P> @Nullable Javadoc acceptJavadoc(JavadocVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
@@ -334,8 +333,7 @@ class Link implements Javadoc {
         @Nullable
         J tree;
 
-        @Nullable
-        public Reference getTreeReference() {
+        public @Nullable Reference getTreeReference() {
             if (tree != null && treeReference == null) {
                 treeReference = new Reference(Tree.randomId(), Markers.EMPTY, tree, null);
             }
@@ -388,8 +386,7 @@ class Parameter implements Javadoc {
         @Nullable
         J name;
 
-        @Nullable
-        public Reference getNameReference() {
+        public @Nullable Reference getNameReference() {
             if (name != null && nameReference == null) {
                 nameReference = new Reference(Tree.randomId(), Markers.EMPTY, name, null);
             }
@@ -456,8 +453,7 @@ class See implements Javadoc {
         @Nullable
         J tree;
 
-        @Nullable
-        public Reference getTreeReference() {
+        public @Nullable Reference getTreeReference() {
             if (tree != null && treeReference == null) {
                 treeReference = new Reference(Tree.randomId(), Markers.EMPTY, tree, null);
             }
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 056d65ebd74..4e6cef2d353 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
@@ -25,8 +25,9 @@
  * a {@link org.openrewrite.java.tree.J.NewClass}.
  */
 public interface MethodCall extends Expression {
-    @Nullable
+
     @Override
+    @Nullable
     JavaType getType();
 
     @Override
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/tree/TypeUtils.java b/rewrite-java/src/main/java/org/openrewrite/java/tree/TypeUtils.java
index 83197399e7b..cd3dfa04e33 100644
--- a/rewrite-java/src/main/java/org/openrewrite/java/tree/TypeUtils.java
+++ b/rewrite-java/src/main/java/org/openrewrite/java/tree/TypeUtils.java
@@ -407,33 +407,27 @@ public static boolean isAssignableTo(Predicate<JavaType> predicate, @Nullable Ja
         return false;
     }
 
-    @Nullable
-    public static JavaType.Class asClass(@Nullable JavaType type) {
+    public static @Nullable JavaType.Class asClass(@Nullable JavaType type) {
         return type instanceof JavaType.Class ? (JavaType.Class) type : null;
     }
 
-    @Nullable
-    public static JavaType.Parameterized asParameterized(@Nullable JavaType type) {
+    public static @Nullable JavaType.Parameterized asParameterized(@Nullable JavaType type) {
         return type instanceof JavaType.Parameterized ? (JavaType.Parameterized) type : null;
     }
 
-    @Nullable
-    public static JavaType.Array asArray(@Nullable JavaType type) {
+    public static @Nullable JavaType.Array asArray(@Nullable JavaType type) {
         return type instanceof JavaType.Array ? (JavaType.Array) type : null;
     }
 
-    @Nullable
-    public static JavaType.GenericTypeVariable asGeneric(@Nullable JavaType type) {
+    public static @Nullable JavaType.GenericTypeVariable asGeneric(@Nullable JavaType type) {
         return type instanceof JavaType.GenericTypeVariable ? (JavaType.GenericTypeVariable) type : null;
     }
 
-    @Nullable
-    public static JavaType.Primitive asPrimitive(@Nullable JavaType type) {
+    public static @Nullable JavaType.Primitive asPrimitive(@Nullable JavaType type) {
         return type instanceof JavaType.Primitive ? (JavaType.Primitive) type : null;
     }
 
-    @Nullable
-    public static JavaType.FullyQualified asFullyQualified(@Nullable JavaType type) {
+    public static @Nullable JavaType.FullyQualified asFullyQualified(@Nullable JavaType type) {
         if (type instanceof JavaType.FullyQualified && !(type instanceof JavaType.Unknown)) {
             return (JavaType.FullyQualified) type;
         }
diff --git a/rewrite-json/src/main/java/org/openrewrite/json/JsonPathMatcher.java b/rewrite-json/src/main/java/org/openrewrite/json/JsonPathMatcher.java
index adeaa006068..3e91ab0e4fa 100644
--- a/rewrite-json/src/main/java/org/openrewrite/json/JsonPathMatcher.java
+++ b/rewrite-json/src/main/java/org/openrewrite/json/JsonPathMatcher.java
@@ -630,8 +630,7 @@ public Object visitBinaryExpression(JsonPathParser.BinaryExpressionContext ctx)
             return null;
         }
 
-        @Nullable
-        private Object getBinaryExpressionResult(Object ctx) {
+        private @Nullable Object getBinaryExpressionResult(Object ctx) {
             if (ctx instanceof JsonPathParser.BinaryExpressionContext) {
                 ctx = visitBinaryExpression((JsonPathParser.BinaryExpressionContext) ctx);
 
@@ -651,8 +650,7 @@ private Object getBinaryExpressionResult(Object ctx) {
         }
 
         // Interpret the LHS to check the appropriate value.
-        @Nullable
-        private Json getOperatorResult(Object lhs, String operator, Object rhs) {
+        private @Nullable Json getOperatorResult(Object lhs, String operator, Object rhs) {
             if (lhs instanceof Json.Member) {
                 Json.Member member = (Json.Member) lhs;
                 if (member.getValue() instanceof Json.Literal) {
@@ -697,8 +695,7 @@ private boolean checkObjectEquality(Object lhs, String operator, Object rhs) {
         }
 
         // Extract the result from JSON objects that can match by key.
-        @Nullable
-        public Object getResultByKey(Object result, String key) {
+        public @Nullable Object getResultByKey(Object result, String key) {
             if (result instanceof Json.JsonObject) {
                 Json.JsonObject jsonObject = (Json.JsonObject) result;
                 for (Json json : jsonObject.getMembers()) {
@@ -742,8 +739,7 @@ private Object getResultFromList(Object results) {
         }
 
         // Extract the value from a Json object.
-        @Nullable
-        private Object getValue(Object result) {
+        private @Nullable Object getValue(Object result) {
             if (result instanceof Json.Member) {
                 return getValue(((Json.Member) result).getValue());
             } else if (result instanceof Json.JsonObject) {
diff --git a/rewrite-json/src/main/java/org/openrewrite/json/internal/JsonParserVisitor.java b/rewrite-json/src/main/java/org/openrewrite/json/internal/JsonParserVisitor.java
index beb5909799b..741564305a3 100644
--- a/rewrite-json/src/main/java/org/openrewrite/json/internal/JsonParserVisitor.java
+++ b/rewrite-json/src/main/java/org/openrewrite/json/internal/JsonParserVisitor.java
@@ -281,8 +281,7 @@ public int advanceCursor(int newCodePointIndex) {
         return cursor;
     }
 
-    @Nullable
-    private <C extends ParserRuleContext, T> T convert(C ctx, BiFunction<C, Space, T> conversion) {
+    private <C extends ParserRuleContext, T> @Nullable T convert(C ctx, BiFunction<C, Space, T> conversion) {
         if (ctx == null) {
             return null;
         }
diff --git a/rewrite-json/src/main/java/org/openrewrite/json/tree/Json.java b/rewrite-json/src/main/java/org/openrewrite/json/tree/Json.java
index c33bf2b8db8..1328a16e7c1 100644
--- a/rewrite-json/src/main/java/org/openrewrite/json/tree/Json.java
+++ b/rewrite-json/src/main/java/org/openrewrite/json/tree/Json.java
@@ -39,8 +39,7 @@ default <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
         return (R) acceptJson(v.adapt(JsonVisitor.class), p);
     }
 
-    @Nullable
-    default <P> Json acceptJson(JsonVisitor<P> v, P p) {
+    default <P> @Nullable Json acceptJson(JsonVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/AddDevelocityMavenExtension.java b/rewrite-maven/src/main/java/org/openrewrite/maven/AddDevelocityMavenExtension.java
index 955b6933f5d..1cd49a0837c 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/AddDevelocityMavenExtension.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/AddDevelocityMavenExtension.java
@@ -320,8 +320,7 @@ private String writeConfiguration(Object config, boolean useCRLFNewLines) {
         }
     }
 
-    @Nullable
-    private BuildScanConfiguration buildScanConfiguration(boolean develocity) {
+    private @Nullable BuildScanConfiguration buildScanConfiguration(boolean develocity) {
         if (uploadInBackground != null || publishCriteria != null || fileFingerprints != null) {
             if (develocity) {
                 PublishingConfiguration publishing = null;
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/AddManagedDependency.java b/rewrite-maven/src/main/java/org/openrewrite/maven/AddManagedDependency.java
index 9431d45774a..d6dc8e6b1c6 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/AddManagedDependency.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/AddManagedDependency.java
@@ -227,8 +227,7 @@ public Xml visitDocument(Xml.Document document, ExecutionContext ctx) {
                 return maven;
             }
 
-            @Nullable
-            private String existingManagedDependencyVersion() {
+            private @Nullable String existingManagedDependencyVersion() {
                 return getResolutionResult().getPom().getDependencyManagement().stream()
                         .map(resolvedManagedDep -> {
                             if (resolvedManagedDep.matches(groupId, artifactId, type, classifier)) {
@@ -244,8 +243,7 @@ private String existingManagedDependencyVersion() {
                         .findFirst().orElse(null);
             }
 
-            @Nullable
-            private String findVersionToUse(VersionComparator versionComparator, ResolvedPom containingPom, ExecutionContext ctx) throws MavenDownloadingException {
+            private @Nullable String findVersionToUse(VersionComparator versionComparator, ResolvedPom containingPom, ExecutionContext ctx) throws MavenDownloadingException {
                 MavenMetadata mavenMetadata = metadataFailures.insertRows(ctx, () -> downloadMetadata(groupId, artifactId, containingPom, ctx));
                 LatestRelease latest = new LatestRelease(versionPattern);
                 return mavenMetadata.getVersioning().getVersions().stream()
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenExecutionContextView.java b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenExecutionContextView.java
index b06eb709499..8f34c5ca5db 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenExecutionContextView.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenExecutionContextView.java
@@ -149,8 +149,7 @@ public MavenExecutionContextView setAddLocalRepository(boolean useLocalRepositor
         return this;
     }
 
-    @Nullable
-    public Boolean getAddLocalRepository() {
+    public @Nullable Boolean getAddLocalRepository() {
         return getMessage(MAVEN_ADD_LOCAL_REPOSITORY, null);
     }
 
@@ -159,8 +158,7 @@ public MavenExecutionContextView setAddCentralRepository(boolean useCentralRepos
         return this;
     }
 
-    @Nullable
-    public Boolean getAddCentralRepository() {
+    public @Nullable Boolean getAddCentralRepository() {
         return getMessage(MAVEN_ADD_CENTRAL_REPOSITORY);
     }
 
@@ -228,8 +226,7 @@ public MavenExecutionContextView setMavenSettings(@Nullable MavenSettings settin
         return this;
     }
 
-    @Nullable
-    public MavenSettings getSettings() {
+    public @Nullable MavenSettings getSettings() {
         return getMessage(MAVEN_SETTINGS, null);
     }
 
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenSettings.java b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenSettings.java
index 8c38c661a4c..e21597af0a0 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenSettings.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenSettings.java
@@ -83,8 +83,7 @@ public MavenSettings(@Nullable String localRepository, @Nullable Profiles profil
         this.servers = servers;
     }
 
-    @Nullable
-    public static MavenSettings parse(Parser.Input source, ExecutionContext ctx) {
+    public static @Nullable MavenSettings parse(Parser.Input source, ExecutionContext ctx) {
         try {
             return new Interpolator().interpolate(
                     MavenXmlMapper.readMapper().readValue(source.getSource(ctx), MavenSettings.class));
@@ -94,8 +93,7 @@ public static MavenSettings parse(Parser.Input source, ExecutionContext ctx) {
         }
     }
 
-    @Nullable
-    public static MavenSettings parse(Path settingsPath, ExecutionContext ctx) {
+    public static @Nullable MavenSettings parse(Path settingsPath, ExecutionContext ctx) {
         return parse(new Parser.Input(settingsPath, () -> {
             try {
                 return Files.newInputStream(settingsPath);
@@ -106,8 +104,7 @@ public static MavenSettings parse(Path settingsPath, ExecutionContext ctx) {
         }), ctx);
     }
 
-    @Nullable
-    public static MavenSettings readMavenSettingsFromDisk(ExecutionContext ctx) {
+    public static @Nullable MavenSettings readMavenSettingsFromDisk(ExecutionContext ctx) {
         final Optional<MavenSettings> userSettings = Optional.of(userSettingsPath())
                 .filter(MavenSettings::exists)
                 .map(path -> parse(path, ctx));
@@ -216,14 +213,12 @@ public MavenSettings interpolate(MavenSettings mavenSettings) {
                     interpolate(mavenSettings.servers));
         }
 
-        @Nullable
-        private ActiveProfiles interpolate(@Nullable ActiveProfiles activeProfiles) {
+        private @Nullable ActiveProfiles interpolate(@Nullable ActiveProfiles activeProfiles) {
             if (activeProfiles == null) return null;
             return new ActiveProfiles(ListUtils.map(activeProfiles.getActiveProfiles(), this::interpolate));
         }
 
-        @Nullable
-        private Mirrors interpolate(@Nullable Mirrors mirrors) {
+        private @Nullable Mirrors interpolate(@Nullable Mirrors mirrors) {
             if (mirrors == null) return null;
             return new Mirrors(ListUtils.map(mirrors.getMirrors(), this::interpolate));
         }
@@ -232,14 +227,12 @@ private Mirror interpolate(Mirror mirror) {
             return new Mirror(interpolate(mirror.id), interpolate(mirror.url), interpolate(mirror.getMirrorOf()), mirror.releases, mirror.snapshots);
         }
 
-        @Nullable
-        private Servers interpolate(@Nullable Servers servers) {
+        private @Nullable Servers interpolate(@Nullable Servers servers) {
             if (servers == null) return null;
             return new Servers(ListUtils.map(servers.getServers(), this::interpolate));
         }
 
-        @Nullable
-        private ServerConfiguration interpolate(@Nullable ServerConfiguration configuration) {
+        private @Nullable ServerConfiguration interpolate(@Nullable ServerConfiguration configuration) {
             if (configuration == null) {
                 return null;
             }
@@ -258,8 +251,7 @@ private Server interpolate(Server server) {
                     interpolate(server.configuration));
         }
 
-        @Nullable
-        private String interpolate(@Nullable String s) {
+        private @Nullable String interpolate(@Nullable String s) {
             return s == null ? null : propertyPlaceholders.replacePlaceholders(s, propertyResolver);
         }
     }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenVisitor.java b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenVisitor.java
index 3a06aa994ca..a2497e4c392 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenVisitor.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenVisitor.java
@@ -259,8 +259,7 @@ private boolean isTag(String name) {
         return getCursor().getValue() instanceof Xml.Tag && name.equals(getCursor().<Xml.Tag>getValue().getName());
     }
 
-    @Nullable
-    public ResolvedDependency findDependency(Xml.Tag tag) {
+    public @Nullable ResolvedDependency findDependency(Xml.Tag tag) {
         Map<Scope, List<ResolvedDependency>> dependencies = getResolutionResult().getDependencies();
         Scope scope = Scope.fromName(tag.getChildValue("scope").orElse("compile"));
         if (dependencies.containsKey(scope)) {
@@ -279,8 +278,7 @@ public ResolvedDependency findDependency(Xml.Tag tag) {
         return null;
     }
 
-    @Nullable
-    public ResolvedManagedDependency findManagedDependency(Xml.Tag tag) {
+    public @Nullable ResolvedManagedDependency findManagedDependency(Xml.Tag tag) {
         String groupId = getResolutionResult().getPom().getValue(tag.getChildValue("groupId")
                 .orElse(getResolutionResult().getPom().getGroupId()));
         String artifactId = getResolutionResult().getPom().getValue(tag.getChildValue("artifactId").orElse(""));
@@ -292,18 +290,15 @@ public ResolvedManagedDependency findManagedDependency(Xml.Tag tag) {
         return null;
     }
 
-    @Nullable
-    public ResolvedManagedDependency findManagedDependency(String groupId, String artifactId) {
+    public @Nullable ResolvedManagedDependency findManagedDependency(String groupId, String artifactId) {
         return findManagedDependency(groupId, artifactId, null);
     }
 
-    @Nullable
-    private ResolvedManagedDependency findManagedDependency(String groupId, String artifactId, @Nullable String classifier) {
+    private @Nullable ResolvedManagedDependency findManagedDependency(String groupId, String artifactId, @Nullable String classifier) {
         return findManagedDependency(groupId, artifactId, classifier, null);
     }
 
-    @Nullable
-    private ResolvedManagedDependency findManagedDependency(String groupId, String artifactId, @Nullable String classifier, @Nullable String type) {
+    private @Nullable ResolvedManagedDependency findManagedDependency(String groupId, String artifactId, @Nullable String classifier, @Nullable String type) {
         for (ResolvedManagedDependency d : getResolutionResult().getPom().getDependencyManagement()) {
             if (groupId.equals(d.getGroupId()) &&
                 artifactId.equals(d.getArtifactId()) &&
@@ -315,8 +310,7 @@ private ResolvedManagedDependency findManagedDependency(String groupId, String a
         return null;
     }
 
-    @Nullable
-    public ResolvedManagedDependency findManagedDependency(Xml.Tag tag, @Nullable Scope inClasspathOf) {
+    public @Nullable ResolvedManagedDependency findManagedDependency(Xml.Tag tag, @Nullable Scope inClasspathOf) {
         Scope tagScope = Scope.fromName(tag.getChildValue("scope").orElse(null));
         if (inClasspathOf != null && tagScope != inClasspathOf && !tagScope.isInClasspathOf(inClasspathOf)) {
             return null;
@@ -324,8 +318,7 @@ public ResolvedManagedDependency findManagedDependency(Xml.Tag tag, @Nullable Sc
         return findManagedDependency(tag);
     }
 
-    @Nullable
-    public ResolvedDependency findDependency(Xml.Tag tag, @Nullable Scope inClasspathOf) {
+    public @Nullable ResolvedDependency findDependency(Xml.Tag tag, @Nullable Scope inClasspathOf) {
         Scope tagScope = Scope.fromName(tag.getChildValue("scope").orElse("compile"));
         if (inClasspathOf != null && tagScope != inClasspathOf && !tagScope.isInClasspathOf(inClasspathOf)) {
             return null;
@@ -394,8 +387,7 @@ public boolean isDependencyLikeTag() {
         return isManagedDependencyTag() || isDependencyTag() || isPluginTag();
     }
 
-    @Nullable
-    public Plugin findPlugin(Xml.Tag tag) {
+    public @Nullable Plugin findPlugin(Xml.Tag tag) {
         List<Plugin> plugins = getResolutionResult().getPom().getPlugins();
         if (plugins != null) {
             for (Plugin resolvedPlugin : plugins) {
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveDuplicateDependencies.java b/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveDuplicateDependencies.java
index 163217d31ec..236a41914ba 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveDuplicateDependencies.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveDuplicateDependencies.java
@@ -106,8 +106,7 @@ private boolean isManagedDependenciesTag() {
                 return MANAGED_DEPENDENCIES_MATCHER.matches(getCursor());
             }
 
-            @Nullable
-            private DependencyKey getDependencyKey(Xml.Tag tag) {
+            private @Nullable DependencyKey getDependencyKey(Xml.Tag tag) {
                 Map<Scope, List<ResolvedDependency>> dependencies = getResolutionResult().getDependencies();
                 Scope scope = tag.getChildValue("scope").map(Scope::fromName).orElse(Scope.Compile);
                 if (dependencies.containsKey(scope)) {
@@ -125,8 +124,7 @@ private DependencyKey getDependencyKey(Xml.Tag tag) {
                 return null;
             }
 
-            @Nullable
-            private DependencyKey getManagedDependencyKey(Xml.Tag tag) {
+            private @Nullable DependencyKey getManagedDependencyKey(Xml.Tag tag) {
                 ResolvedManagedDependency resolvedDependency = findManagedDependency(tag);
                 return resolvedDependency != null ? DependencyKey.from(resolvedDependency) : null;
             }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveRedundantDependencyVersions.java b/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveRedundantDependencyVersions.java
index fdfcbc290e9..0162a99a682 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveRedundantDependencyVersions.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveRedundantDependencyVersions.java
@@ -308,8 +308,7 @@ && matchesGlob(d.getArtifactId(), exceptedArtifactId)) {
         };
     }
 
-    @Nullable
-    private static String getManagedPluginVersion(ResolvedPom resolvedPom, @Nullable String groupId, String artifactId) {
+    private static @Nullable String getManagedPluginVersion(ResolvedPom resolvedPom, @Nullable String groupId, String artifactId) {
         for (Plugin p : resolvedPom.getPluginManagement()) {
             if (Objects.equals(
                     Optional.ofNullable(p.getGroupId()).orElse("org.apache.maven.plugins"),
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/UpdateMavenModel.java b/rewrite-maven/src/main/java/org/openrewrite/maven/UpdateMavenModel.java
index 995cdcbb651..7c43e81a83a 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/UpdateMavenModel.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/UpdateMavenModel.java
@@ -137,8 +137,7 @@ public Xml visitDocument(Xml.Document document, P p) {
         }
     }
 
-    @Nullable
-    private List<GroupArtifact> mapExclusions(Xml.Tag tag) {
+    private @Nullable List<GroupArtifact> mapExclusions(Xml.Tag tag) {
         return tag.getChild("exclusions")
                 .map(exclusions -> {
                     List<Xml.Tag> eachExclusion = exclusions.getChildren("exclusion");
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/UpgradeDependencyVersion.java b/rewrite-maven/src/main/java/org/openrewrite/maven/UpgradeDependencyVersion.java
index 6c99dc6f11a..acb1aff9079 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/UpgradeDependencyVersion.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/UpgradeDependencyVersion.java
@@ -322,8 +322,7 @@ private Xml.Tag upgradeDependency(ExecutionContext ctx, Xml.Tag t) throws MavenD
                 return t;
             }
 
-            @Nullable
-            private TreeVisitor<Xml, ExecutionContext> upgradeManagedDependency(Xml.Tag tag, ExecutionContext ctx, Xml.Tag t) throws MavenDownloadingException {
+            private @Nullable TreeVisitor<Xml, ExecutionContext> upgradeManagedDependency(Xml.Tag tag, ExecutionContext ctx, Xml.Tag t) throws MavenDownloadingException {
                 ResolvedManagedDependency managedDependency = findManagedDependency(t);
                 if (managedDependency != null) {
                     String groupId = managedDependency.getGroupId();
@@ -381,8 +380,7 @@ private String resolveVersion(String version) {
                 return version;
             }
 
-            @Nullable
-            public TreeVisitor<Xml, ExecutionContext> upgradeVersion(ExecutionContext ctx, Xml.Tag tag, @Nullable String requestedVersion, String groupId, String artifactId, String version2) throws MavenDownloadingException {
+            public @Nullable TreeVisitor<Xml, ExecutionContext> upgradeVersion(ExecutionContext ctx, Xml.Tag tag, @Nullable String requestedVersion, String groupId, String artifactId, String version2) throws MavenDownloadingException {
                 String newerVersion = findNewerVersion(groupId, artifactId, version2, ctx);
                 if (newerVersion == null) {
                     return null;
@@ -399,8 +397,7 @@ public TreeVisitor<Xml, ExecutionContext> upgradeVersion(ExecutionContext ctx, X
                 return null;
             }
 
-            @Nullable
-            private String findNewerVersion(String groupId, String artifactId, String version, ExecutionContext ctx)
+            private @Nullable String findNewerVersion(String groupId, String artifactId, String version, ExecutionContext ctx)
                     throws MavenDownloadingException {
                 return UpgradeDependencyVersion.this.findNewerVersion(
                         version, () -> downloadMetadata(groupId, artifactId, ctx), versionComparator, ctx);
@@ -408,8 +405,7 @@ private String findNewerVersion(String groupId, String artifactId, String versio
         };
     }
 
-    @Nullable
-    private String findNewerVersion(
+    private @Nullable String findNewerVersion(
             String version, MavenMetadataFailures.MavenMetadataDownloader download, VersionComparator versionComparator, ExecutionContext ctx) throws MavenDownloadingException {
         String finalVersion = !Semver.isVersion(version) ? "0.0.0" : version;
 
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/CompositeMavenPomCache.java b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/CompositeMavenPomCache.java
index 13dfc798089..ef028bea7a2 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/CompositeMavenPomCache.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/CompositeMavenPomCache.java
@@ -29,9 +29,8 @@ public class CompositeMavenPomCache implements MavenPomCache {
     private final MavenPomCache l1;
     private final MavenPomCache l2;
 
-    @Nullable
     @Override
-    public ResolvedPom getResolvedDependencyPom(ResolvedGroupArtifactVersion dependency) {
+    public @Nullable ResolvedPom getResolvedDependencyPom(ResolvedGroupArtifactVersion dependency) {
         ResolvedPom l1r = l1.getResolvedDependencyPom(dependency);
         if(l1r != null) {
             return l1r;
@@ -49,9 +48,8 @@ public void putResolvedDependencyPom(ResolvedGroupArtifactVersion dependency, Re
         l2.putResolvedDependencyPom(dependency, resolved);
     }
 
-    @Nullable
     @Override
-    public Optional<MavenMetadata> getMavenMetadata(URI repo, GroupArtifactVersion gav) {
+    public @Nullable Optional<MavenMetadata> getMavenMetadata(URI repo, GroupArtifactVersion gav) {
         Optional<MavenMetadata> l1m = l1.getMavenMetadata(repo, gav);
         if(l1m != null) {
             return l1m;
@@ -69,9 +67,8 @@ public void putMavenMetadata(URI repo, GroupArtifactVersion gav, MavenMetadata m
         l2.putMavenMetadata(repo, gav, metadata);
     }
 
-    @Nullable
     @Override
-    public Optional<Pom> getPom(ResolvedGroupArtifactVersion gav) throws MavenDownloadingException {
+    public @Nullable Optional<Pom> getPom(ResolvedGroupArtifactVersion gav) throws MavenDownloadingException {
         Optional<Pom> l1p = l1.getPom(gav);
         if(l1p != null) {
             return l1p;
@@ -89,9 +86,8 @@ public void putPom(ResolvedGroupArtifactVersion gav, Pom pom) {
         l2.putPom(gav, pom);
     }
 
-    @Nullable
     @Override
-    public Optional<MavenRepository> getNormalizedRepository(MavenRepository repository) {
+    public @Nullable Optional<MavenRepository> getNormalizedRepository(MavenRepository repository) {
         Optional<MavenRepository> l1r = l1.getNormalizedRepository(repository);
         if(l1r != null) {
             return l1r;
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/InMemoryMavenPomCache.java b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/InMemoryMavenPomCache.java
index 63f8ee25fe4..71233c84b3e 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/InMemoryMavenPomCache.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/InMemoryMavenPomCache.java
@@ -78,9 +78,8 @@ public InMemoryMavenPomCache(Cache<ResolvedGroupArtifactVersion, Optional<Pom>>
         this("default", pomCache, mavenMetadataCache, repositoryCache, dependencyCache);
     }
 
-    @Nullable
     @Override
-    public ResolvedPom getResolvedDependencyPom(ResolvedGroupArtifactVersion dependency) {
+    public @Nullable ResolvedPom getResolvedDependencyPom(ResolvedGroupArtifactVersion dependency) {
         return dependencyCache.getIfPresent(dependency);
     }
 
@@ -89,9 +88,8 @@ public void putResolvedDependencyPom(ResolvedGroupArtifactVersion dependency, Re
         dependencyCache.put(dependency, resolved.deduplicate());
     }
 
-    @Nullable
     @Override
-    public Optional<MavenMetadata> getMavenMetadata(URI repo, GroupArtifactVersion gav) {
+    public @Nullable Optional<MavenMetadata> getMavenMetadata(URI repo, GroupArtifactVersion gav) {
         return mavenMetadataCache.getIfPresent(new MetadataKey(repo, gav));
     }
 
@@ -100,9 +98,8 @@ public void putMavenMetadata(URI repo, GroupArtifactVersion gav, @Nullable Maven
         mavenMetadataCache.put(new MetadataKey(repo, gav), Optional.ofNullable(metadata));
     }
 
-    @Nullable
     @Override
-    public Optional<Pom> getPom(ResolvedGroupArtifactVersion gav) {
+    public @Nullable Optional<Pom> getPom(ResolvedGroupArtifactVersion gav) {
         return pomCache.getIfPresent(gav);
     }
 
@@ -112,8 +109,7 @@ public void putPom(ResolvedGroupArtifactVersion gav, @Nullable Pom pom) {
     }
 
     @Override
-    @Nullable
-    public Optional<MavenRepository> getNormalizedRepository(MavenRepository repository) {
+    public @Nullable Optional<MavenRepository> getNormalizedRepository(MavenRepository repository) {
         return repositoryCache.getIfPresent(repository);
     }
 
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/LocalMavenArtifactCache.java b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/LocalMavenArtifactCache.java
index f0ed18ccfd7..e2c365f9513 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/LocalMavenArtifactCache.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/LocalMavenArtifactCache.java
@@ -42,15 +42,13 @@ public LocalMavenArtifactCache(Path cache) {
     }
 
     @Override
-    @Nullable
-    public Path getArtifact(ResolvedDependency dependency) {
+    public @Nullable Path getArtifact(ResolvedDependency dependency) {
         Path path = dependencyPath(dependency);
         return path.toFile().exists() ? path : null;
     }
 
     @Override
-    @Nullable
-    public Path putArtifact(ResolvedDependency dependency, InputStream artifactInputStream, Consumer<Throwable> onError) {
+    public @Nullable Path putArtifact(ResolvedDependency dependency, InputStream artifactInputStream, Consumer<Throwable> onError) {
         if (artifactInputStream == null) {
             return null;
         }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/MavenArtifactCache.java b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/MavenArtifactCache.java
index ee11305dfba..f21fea14622 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/MavenArtifactCache.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/MavenArtifactCache.java
@@ -32,8 +32,7 @@ public Path getArtifact(ResolvedDependency dependency) {
         }
 
         @Override
-        @Nullable
-        public Path putArtifact(ResolvedDependency dependency, InputStream is, Consumer<Throwable> onError) {
+        public @Nullable Path putArtifact(ResolvedDependency dependency, InputStream is, Consumer<Throwable> onError) {
             try {
                 is.close();
             } catch (IOException e) {
@@ -49,8 +48,7 @@ public Path putArtifact(ResolvedDependency dependency, InputStream is, Consumer<
     @Nullable
     Path putArtifact(ResolvedDependency dependency, InputStream is, Consumer<Throwable> onError);
 
-    @Nullable
-    default Path computeArtifact(ResolvedDependency dependency, Callable<@Nullable InputStream> artifactStream,
+    default @Nullable Path computeArtifact(ResolvedDependency dependency, Callable<@Nullable InputStream> artifactStream,
                                  Consumer<Throwable> onError) {
         Path artifact = getArtifact(dependency);
         if (artifact == null) {
@@ -69,15 +67,13 @@ default MavenArtifactCache orElse(MavenArtifactCache other) {
         MavenArtifactCache me = this;
         return new MavenArtifactCache() {
             @Override
-            @Nullable
-            public Path getArtifact(ResolvedDependency dependency) {
+            public @Nullable Path getArtifact(ResolvedDependency dependency) {
                 Path artifact = me.getArtifact(dependency);
                 return artifact == null ? other.getArtifact(dependency) : artifact;
             }
 
             @Override
-            @Nullable
-            public Path putArtifact(ResolvedDependency dependency, InputStream is, Consumer<Throwable> onError) {
+            public @Nullable Path putArtifact(ResolvedDependency dependency, InputStream is, Consumer<Throwable> onError) {
                 Path artifact = me.putArtifact(dependency, is, onError);
                 return artifact == null ? other.putArtifact(dependency, is, onError) : artifact;
             }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/ReadOnlyLocalMavenArtifactCache.java b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/ReadOnlyLocalMavenArtifactCache.java
index dcef0d1cddf..65f7185ed3c 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/ReadOnlyLocalMavenArtifactCache.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/ReadOnlyLocalMavenArtifactCache.java
@@ -33,15 +33,13 @@ public static ReadOnlyLocalMavenArtifactCache mavenLocal() {
                 Paths.get(System.getProperty("user.home"), ".m2", "repository"));
     }
 
-    @Nullable
     @Override
-    public Path getArtifact(ResolvedDependency dependency) {
+    public @Nullable Path getArtifact(ResolvedDependency dependency) {
         return super.getArtifact(dependency);
     }
 
-    @Nullable
     @Override
-    public Path putArtifact(ResolvedDependency dependency, InputStream artifactInputStream, Consumer<Throwable> onError) {
+    public @Nullable Path putArtifact(ResolvedDependency dependency, InputStream artifactInputStream, Consumer<Throwable> onError) {
         return null;
     }
 }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/RocksdbMavenPomCache.java b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/RocksdbMavenPomCache.java
index ff29426a189..fa70ed0024d 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/cache/RocksdbMavenPomCache.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/cache/RocksdbMavenPomCache.java
@@ -122,9 +122,8 @@ public RocksdbMavenPomCache(Path workspace) {
         cache = getCache(pomCacheDir.getAbsolutePath());
     }
 
-    @Nullable
     @Override
-    public ResolvedPom getResolvedDependencyPom(ResolvedGroupArtifactVersion dependency) {
+    public @Nullable ResolvedPom getResolvedDependencyPom(ResolvedGroupArtifactVersion dependency) {
         return null;
     }
 
@@ -132,9 +131,8 @@ public ResolvedPom getResolvedDependencyPom(ResolvedGroupArtifactVersion depende
     public void putResolvedDependencyPom(ResolvedGroupArtifactVersion dependency, ResolvedPom resolved) {
     }
 
-    @Nullable
     @Override
-    public Optional<MavenMetadata> getMavenMetadata(URI repo, GroupArtifactVersion gav) {
+    public @Nullable Optional<MavenMetadata> getMavenMetadata(URI repo, GroupArtifactVersion gav) {
         //The Maven metadata is not something that should be stored long term, as it will change over time.
         return null;
     }
@@ -168,8 +166,7 @@ public void putPom(ResolvedGroupArtifactVersion gav, Pom pom) {
     }
 
     @Override
-    @Nullable
-    public Optional<MavenRepository> getNormalizedRepository(MavenRepository repository) {
+    public @Nullable Optional<MavenRepository> getNormalizedRepository(MavenRepository repository) {
         return null;
     }
 
@@ -188,8 +185,7 @@ static <T> byte[] serialize(T object) {
         }
     }
 
-    @Nullable
-    static Optional<Pom> deserializePom(byte[] bytes) {
+    static @Nullable Optional<Pom> deserializePom(byte[] bytes) {
         try {
             return bytes == null ? null : Optional.of(mapper.readValue(bytes, Pom.class));
         } catch (IOException e) {
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 613c8f31e37..7096bcc16fa 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
@@ -202,8 +202,7 @@ private List<Pom> getAncestryWithinProject(Pom projectPom, Map<Path, Pom> projec
         }
     }
 
-    @Nullable
-    private Pom getParentWithinProject(Pom projectPom, Map<Path, Pom> projectPoms) {
+    private @Nullable Pom getParentWithinProject(Pom projectPom, Map<Path, Pom> projectPoms) {
         final Parent parent = projectPom.getParent();
         if (parent == null || projectPom.getSourcePath() == null) {
             return null;
@@ -347,8 +346,7 @@ public MavenMetadata downloadMetadata(GroupArtifactVersion gav, @Nullable Resolv
      * @param repo The repository that will be queried for directory results
      * @return Metadata or null if the metadata cannot be derived.
      */
-    @Nullable
-    private MavenMetadata deriveMetadata(GroupArtifactVersion gav, MavenRepository repo) throws HttpSenderResponseException, IOException, MavenDownloadingException {
+    private @Nullable MavenMetadata deriveMetadata(GroupArtifactVersion gav, MavenRepository repo) throws HttpSenderResponseException, IOException, MavenDownloadingException {
         if ((repo.getDeriveMetadataIfMissing() != null && !repo.getDeriveMetadataIfMissing()) || gav.getVersion() != null) {
             // Do not derive metadata if we cannot navigate/browse the artifacts.
             // Do not derive metadata if a specific version has been defined.
@@ -384,8 +382,7 @@ private MavenMetadata deriveMetadata(GroupArtifactVersion gav, MavenRepository r
         }
     }
 
-    @Nullable
-    private MavenMetadata.Versioning directoryToVersioning(String uri, GroupArtifactVersion gav) throws MavenDownloadingException {
+    private @Nullable MavenMetadata.Versioning directoryToVersioning(String uri, GroupArtifactVersion gav) throws MavenDownloadingException {
         Path dir = Paths.get(URI.create(uri));
         if (Files.exists(dir)) {
             try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
@@ -403,8 +400,7 @@ private MavenMetadata.Versioning directoryToVersioning(String uri, GroupArtifact
         return null;
     }
 
-    @Nullable
-    private MavenMetadata.Versioning htmlIndexToVersioning(String responseBody, String uri) {
+    private @Nullable MavenMetadata.Versioning htmlIndexToVersioning(String responseBody, String uri) {
         // A very primitive approach, this just finds hrefs with trailing "/",
         List<String> versions = new ArrayList<>();
         int start = responseBody.indexOf("<a href=\"");
@@ -460,8 +456,7 @@ private List<String> mergeVersions(List<String> versions1, List<String> versions
         return new ArrayList<>(merged);
     }
 
-    @Nullable
-    private MavenMetadata.Snapshot maxSnapshot(@Nullable MavenMetadata.Snapshot s1, @Nullable MavenMetadata.Snapshot s2) {
+    private @Nullable MavenMetadata.Snapshot maxSnapshot(@Nullable MavenMetadata.Snapshot s1, @Nullable MavenMetadata.Snapshot s2) {
         // apparently the snapshot timestamp is not always present in the metadata
         if (s1 == null || s1.getTimestamp() == null) {
             return s2;
@@ -644,8 +639,7 @@ private GroupArtifactVersion handleSnapshotTimestampVersion(GroupArtifactVersion
         return gav;
     }
 
-    @Nullable
-    private String datedSnapshotVersion(GroupArtifactVersion gav, @Nullable ResolvedPom containingPom, List<MavenRepository> repositories, ExecutionContext ctx) {
+    private @Nullable String datedSnapshotVersion(GroupArtifactVersion gav, @Nullable ResolvedPom containingPom, List<MavenRepository> repositories, ExecutionContext ctx) {
         if (gav.getVersion() != null && gav.getVersion().endsWith("-SNAPSHOT")) {
             for (ResolvedGroupArtifactVersion pinnedSnapshotVersion : new MavenExecutionContextView(ctx).getPinnedSnapshotVersions()) {
                 if (pinnedSnapshotVersion.getDatedSnapshotVersion() != null &&
@@ -704,8 +698,7 @@ Collection<MavenRepository> distinctNormalizedRepositories(
         return normalizedRepositories.values();
     }
 
-    @Nullable
-    public MavenRepository normalizeRepository(MavenRepository originalRepository, MavenExecutionContextView ctx, @Nullable ResolvedPom containingPom) {
+    public @Nullable MavenRepository normalizeRepository(MavenRepository originalRepository, MavenExecutionContextView ctx, @Nullable ResolvedPom containingPom) {
         Optional<MavenRepository> result = null;
         MavenRepository repository = originalRepository;
         if (containingPom != null) {
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/RawPom.java b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/RawPom.java
index f8e45e2e814..ac15bc9b09c 100755
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/RawPom.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/RawPom.java
@@ -334,13 +334,11 @@ public static class Profile {
         RawRepositories repositories;
     }
 
-    @Nullable
-    public String getGroupId() {
+    public @Nullable String getGroupId() {
         return groupId == null && parent != null ? parent.getGroupId() : groupId;
     }
 
-    @Nullable
-    public String getVersion() {
+    public @Nullable String getVersion() {
         if(version == null) {
             if(currentVersion == null) {
                 if(parent == null) {
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/VersionRequirement.java b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/VersionRequirement.java
index 2515332d9db..90c90dede80 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/internal/VersionRequirement.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/internal/VersionRequirement.java
@@ -230,16 +230,14 @@ public String toString() {
         }
     }
 
-    @Nullable
-    public String resolve(DownloadOperation<Iterable<String>> availableVersions) throws MavenDownloadingException {
+    public @Nullable String resolve(DownloadOperation<Iterable<String>> availableVersions) throws MavenDownloadingException {
         if (selected == null) {
             selected = cacheResolved(availableVersions);
         }
         return selected;
     }
 
-    @Nullable
-    private String cacheResolved(DownloadOperation<Iterable<String>> availableVersions) throws MavenDownloadingException {
+    private @Nullable String cacheResolved(DownloadOperation<Iterable<String>> availableVersions) throws MavenDownloadingException {
         String nearestSoftRequirement = null;
         VersionRequirement next = this;
         VersionRequirement nearestHardRequirement = null;
@@ -282,8 +280,7 @@ private String cacheResolved(DownloadOperation<Iterable<String>> availableVersio
         return latest.toString();
     }
 
-    @Nullable
-    public String resolve(GroupArtifact groupArtifact, MavenPomDownloader downloader, List<MavenRepository> repositories) throws MavenDownloadingException {
+    public @Nullable String resolve(GroupArtifact groupArtifact, MavenPomDownloader downloader, List<MavenRepository> repositories) throws MavenDownloadingException {
         return resolve(() -> {
             MavenMetadata metadata = downloader.downloadMetadata(groupArtifact, null, repositories);
             return metadata.getVersioning().getVersions();
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Dependency.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Dependency.java
index f9810911ee2..c00d703d906 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Dependency.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Dependency.java
@@ -45,8 +45,7 @@ public class Dependency implements Serializable {
     @Nullable
     String optional;
 
-    @Nullable
-    public String getGroupId() {
+    public @Nullable String getGroupId() {
         return gav.getGroupId();
     }
 
@@ -54,8 +53,7 @@ public String getArtifactId() {
         return gav.getArtifactId();
     }
 
-    @Nullable
-    public String getVersion() {
+    public @Nullable String getVersion() {
         return gav.getVersion();
     }
 
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/GraphvizResolutionEventListener.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/GraphvizResolutionEventListener.java
index 1595b11340a..857c4ae3674 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/GraphvizResolutionEventListener.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/GraphvizResolutionEventListener.java
@@ -191,8 +191,7 @@ private MutableNode propNode(String key, String value) {
         });
     }
 
-    @Nullable
-    private String gavUrl(GroupArtifactVersion gav) {
+    private @Nullable String gavUrl(GroupArtifactVersion gav) {
         if (gav.getGroupId() == null || gav.getArtifactId() == null || gav.getVersion() == null) {
             return null;
         }
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 ce729f86a4a..197ca8adc12 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
@@ -59,9 +59,8 @@ public String getArtifactId() {
             return gav.getArtifactId();
         }
 
-        @Nullable
         @Override
-        public String getVersion() {
+        public @Nullable String getVersion() {
             return gav.getVersion();
         }
 
@@ -87,9 +86,8 @@ public String getArtifactId() {
             return gav.getArtifactId();
         }
 
-        @Nullable
         @Override
-        public String getVersion() {
+        public @Nullable String getVersion() {
             return gav.getVersion();
         }
 
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenRepository.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenRepository.java
index 0057ad96638..cedcd8e92d2 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenRepository.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenRepository.java
@@ -205,8 +205,7 @@ public Builder timeout(Duration timeout) {
             return this;
         }
 
-        @Nullable
-        private static String resolveEnvironmentProperty(@Nullable String rawProperty) {
+        private static @Nullable String resolveEnvironmentProperty(@Nullable String rawProperty) {
             if (rawProperty == null) {
                 return null;
             }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenResolutionResult.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenResolutionResult.java
index ddf23071d86..057f1de2e8e 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenResolutionResult.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/MavenResolutionResult.java
@@ -76,8 +76,7 @@ public MavenResolutionResult unsafeSetManagedReference(Integer id) {
         return this;
     }
 
-    @Nullable
-    public ResolvedDependency getResolvedDependency(Dependency dependency) {
+    public @Nullable ResolvedDependency getResolvedDependency(Dependency dependency) {
         for (int i = Scope.values().length - 1; i >= 0; i--) {
             Scope scope = Scope.values()[i];
             if (dependencies.containsKey(scope)) {
@@ -153,8 +152,7 @@ public void unsafeSetModules(@Nullable List<MavenResolutionResult> modules) {
         this.modules = modules == null ? emptyList() : new ArrayList<>(modules);
     }
 
-    @Nullable
-    public ResolvedManagedDependency getResolvedManagedDependency(ManagedDependency dependency) {
+    public @Nullable ResolvedManagedDependency getResolvedManagedDependency(ManagedDependency dependency) {
         for (ResolvedManagedDependency dm : pom.getDependencyManagement()) {
             if (dm.getRequested() == dependency || dm.getRequestedBom() == dependency) {
                 return dm;
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 f0df862806c..331e494caa1 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
@@ -67,8 +67,7 @@ public static class Execution {
         JsonNode configuration;
     }
 
-    @Nullable
-    public String getConfigurationStringValue(String path) {
+    public @Nullable String getConfigurationStringValue(String path) {
         if (configuration == null) {
             return null;
         }
@@ -86,8 +85,7 @@ public String getConfigurationStringValue(String path) {
         return MavenXmlMapper.readMapper().convertValue(current, String.class);
     }
 
-    @Nullable
-    public <T> T getConfiguration(String path, Class<T> configClass) {
+    public <T> @Nullable T getConfiguration(String path, Class<T> configClass) {
         if (configuration == null) {
             return null;
         }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Pom.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Pom.java
index f071f47dbae..570d4e30cf4 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Pom.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Pom.java
@@ -124,8 +124,7 @@ public String getVersion() {
         return gav.getVersion();
     }
 
-    @Nullable
-    public String getDatedSnapshotVersion() {
+    public @Nullable String getDatedSnapshotVersion() {
         return gav.getDatedSnapshotVersion();
     }
 
@@ -186,8 +185,7 @@ public ResolvedPom resolve(Iterable<String> activeProfiles,
                 .resolve(ctx, downloader);
     }
 
-    @Nullable
-    public String getValue(@Nullable String value) {
+    public @Nullable String getValue(@Nullable String value) {
         if (value == null) {
             return null;
         }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedDependency.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedDependency.java
index fabda7f01cb..742b4640e50 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedDependency.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedDependency.java
@@ -110,18 +110,15 @@ public boolean isTransitive() {
         return depth != 0;
     }
 
-    @Nullable
-    public String getDatedSnapshotVersion() {
+    public @Nullable String getDatedSnapshotVersion() {
         return gav.getDatedSnapshotVersion();
     }
 
-    @Nullable
-    public ResolvedDependency findDependency(String groupId, String artifactId) {
+    public @Nullable ResolvedDependency findDependency(String groupId, String artifactId) {
         return findDependency0(groupId, artifactId, Collections.newSetFromMap(new IdentityHashMap<>()));
     }
 
-    @Nullable
-    private ResolvedDependency findDependency0(String groupId, String artifactId, Set<ResolvedDependency> visited) {
+    private @Nullable ResolvedDependency findDependency0(String groupId, String artifactId, Set<ResolvedDependency> visited) {
         if (matchesGlob(getGroupId(), groupId) && matchesGlob(getArtifactId(), artifactId)) {
             return this;
         } else if (!visited.add(this)) {
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedManagedDependency.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedManagedDependency.java
index 63761051ab0..fe8d6e9fcbd 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedManagedDependency.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedManagedDependency.java
@@ -64,8 +64,7 @@ public String getArtifactId() {
      *
      * @return the version of the dependency
      */
-    @Nullable
-    public String getVersion() {
+    public @Nullable String getVersion() {
         return gav.getVersion();
     }
 
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
index e970abd798f..ad9f9934951 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java
@@ -256,8 +256,7 @@ public String getVersion() {
     }
 
     @SuppressWarnings("unused")
-    @Nullable
-    public String getDatedSnapshotVersion() {
+    public @Nullable String getDatedSnapshotVersion() {
         return requested.getDatedSnapshotVersion();
     }
 
@@ -265,16 +264,14 @@ public String getPackaging() {
         return requested.getPackaging() == null ? "jar" : requested.getPackaging();
     }
 
-    @Nullable
-    public String getValue(@Nullable String value) {
+    public @Nullable String getValue(@Nullable String value) {
         if (value == null) {
             return null;
         }
         return placeholderHelper.replacePlaceholders(value, this::getProperty);
     }
 
-    @Nullable
-    private String getProperty(@Nullable String property) {
+    private @Nullable String getProperty(@Nullable String property) {
         if (property == null) {
             return null;
         }
@@ -305,8 +302,7 @@ private String getProperty(@Nullable String property) {
         return System.getProperty(property, properties.get(property));
     }
 
-    @Nullable
-    public String getManagedVersion(@Nullable String groupId, String artifactId, @Nullable String type, @Nullable String classifier) {
+    public @Nullable String getManagedVersion(@Nullable String groupId, String artifactId, @Nullable String type, @Nullable String classifier) {
         for (ResolvedManagedDependency dm : dependencyManagement) {
             if (dm.matches(groupId, artifactId, type, classifier)) {
                 return getValue(dm.getVersion());
@@ -325,8 +321,7 @@ public List<GroupArtifact> getManagedExclusions(String groupId, String artifactI
         return emptyList();
     }
 
-    @Nullable
-    public Scope getManagedScope(String groupId, String artifactId, @Nullable String type, @Nullable String classifier) {
+    public @Nullable Scope getManagedScope(String groupId, String artifactId, @Nullable String type, @Nullable String classifier) {
         for (ResolvedManagedDependency dm : dependencyManagement) {
             if (dm.matches(groupId, artifactId, type, classifier)) {
                 return dm.getScope();
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Scope.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Scope.java
index f46b41a8455..fb50ce0259c 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Scope.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Scope.java
@@ -41,8 +41,7 @@ public boolean isInClasspathOf(@Nullable Scope scope) {
      * @param scope The scope on the left column of the table.
      * @return The scope inside the table.
      */
-    @Nullable
-    public Scope transitiveOf(@Nullable Scope scope) {
+    public @Nullable Scope transitiveOf(@Nullable Scope scope) {
         if (scope == null) {
             return this;
         }
@@ -121,7 +120,7 @@ public static Scope fromName(@Nullable String scope) {
      *
      * @return Scope with the higher precedence.
      */
-    @Nullable public static Scope maxPrecedence(@Nullable Scope scope1, @Nullable Scope scope2) {
+    public static @Nullable Scope maxPrecedence(@Nullable Scope scope1, @Nullable Scope scope2) {
         if (scope1 == null) {
             return scope2;
         } else if (scope2 == null) {
@@ -140,8 +139,7 @@ public static Scope fromName(@Nullable String scope) {
      * be used deliberately and in contexts sufficiently general that the differences are not important.
      */
     @SuppressWarnings("unused")
-    @Nullable
-    public static String asGradleConfigurationName(@Nullable Scope scope) {
+    public static @Nullable String asGradleConfigurationName(@Nullable Scope scope) {
         if(scope == null) {
             return null;
         }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/MavenArtifactDownloader.java b/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/MavenArtifactDownloader.java
index e412d7c3218..9c3dd661f0c 100644
--- a/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/MavenArtifactDownloader.java
+++ b/rewrite-maven/src/main/java/org/openrewrite/maven/utilities/MavenArtifactDownloader.java
@@ -86,8 +86,7 @@ public MavenArtifactDownloader(MavenArtifactCache mavenArtifactCache,
      * @param dependency The dependency to download.
      * @return The path on disk of the downloaded artifact or <code>null</code> if unable to download.
      */
-    @Nullable
-    public Path downloadArtifact(ResolvedDependency dependency) {
+    public @Nullable Path downloadArtifact(ResolvedDependency dependency) {
         if (dependency.getRequested().getType() != null && !"jar".equals(dependency.getRequested().getType())) {
             return null;
         }
diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyValue.java b/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyValue.java
index a5625e59889..1d3b03bfa0e 100755
--- a/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyValue.java
+++ b/rewrite-properties/src/main/java/org/openrewrite/properties/ChangePropertyValue.java
@@ -96,8 +96,8 @@ public Properties visitEntry(Properties.Entry entry, P p) {
             return e;
         }
 
-        @Nullable // returns null if value should not change
-        private Properties.Value updateValue(Properties.Value value) {
+        // returns null if value should not change
+        private @Nullable Properties.Value updateValue(Properties.Value value) {
             Properties.Value updatedValue = value.withText(Boolean.TRUE.equals(regex)
                     ? value.getText().replaceAll(oldValue, newValue)
                     : newValue);
diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java b/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java
index 168a88865fb..4cdcfe6ef3e 100755
--- a/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java
+++ b/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java
@@ -113,8 +113,7 @@ private Properties.File parseFromInput(Path sourceFile, EncodingDetectingInputSt
         );
     }
 
-    @Nullable
-    private Properties.Content extractContent(String line, StringBuilder prefix) {
+    private @Nullable Properties.Content extractContent(String line, StringBuilder prefix) {
         Properties.Content content = null;
         if (line.trim().startsWith("#") || line.trim().startsWith("!")) {
             Properties.Comment.Delimiter delimiter = line.trim().startsWith("#") ?
diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesVisitor.java b/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesVisitor.java
index 057331b2c8a..0c8a5efd0f0 100644
--- a/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesVisitor.java
+++ b/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesVisitor.java
@@ -50,8 +50,7 @@ public Properties visitEntry(Properties.Entry entry, P p) {
     }
 
     //Note: Properties.Value does not currently implement Properties, so this is a bit of an outlier.
-    @Nullable
-    public Properties.Value visitValue(Properties.Value value, P p) {
+    public @Nullable Properties.Value visitValue(Properties.Value value, P p) {
         return value.withMarkers(visitMarkers(value.getMarkers(), p));
     }
 
diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/tree/Properties.java b/rewrite-properties/src/main/java/org/openrewrite/properties/tree/Properties.java
index 8b141ed5289..4585f0d1b05 100755
--- a/rewrite-properties/src/main/java/org/openrewrite/properties/tree/Properties.java
+++ b/rewrite-properties/src/main/java/org/openrewrite/properties/tree/Properties.java
@@ -45,8 +45,7 @@ default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
         return v.isAdaptableTo(PropertiesVisitor.class);
     }
 
-    @Nullable
-    default <P> Properties acceptProperties(PropertiesVisitor<P> v, P p) {
+    default <P> @Nullable Properties acceptProperties(PropertiesVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
diff --git a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/internal/ProtoParserVisitor.java b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/internal/ProtoParserVisitor.java
index c50d5714cc9..68dcf3e1d7a 100644
--- a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/internal/ProtoParserVisitor.java
+++ b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/internal/ProtoParserVisitor.java
@@ -283,8 +283,7 @@ public FullName visitOptionName(Protobuf2Parser.OptionNameContext ctx) {
         return name;
     }
 
-    @Nullable
-    private ProtoContainer<Proto.Option> mapOptionList(@Nullable Protobuf2Parser.OptionListContext ctx) {
+    private @Nullable ProtoContainer<Proto.Option> mapOptionList(@Nullable Protobuf2Parser.OptionListContext ctx) {
         if (ctx == null) {
             return null;
         }
@@ -438,8 +437,7 @@ private Space prefix(Token token) {
         return Space.format(prefix);
     }
 
-    @Nullable
-    private <C extends ParserRuleContext, T> T convert(C ctx, BiFunction<C, Space, T> conversion) {
+    private <C extends ParserRuleContext, T> @Nullable T convert(C ctx, BiFunction<C, Space, T> conversion) {
         //noinspection ConstantConditions
         if (ctx == null) {
             return null;
diff --git a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/Proto.java b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/Proto.java
index 3edbf1363a1..7153931b43b 100644
--- a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/Proto.java
+++ b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/Proto.java
@@ -39,8 +39,7 @@ default <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
         return (R) acceptProto(v.adapt(ProtoVisitor.class), p);
     }
 
-    @Nullable
-    default <P> Proto acceptProto(ProtoVisitor<P> v, P p) {
+    default <P> @Nullable Proto acceptProto(ProtoVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
@@ -354,8 +353,7 @@ public Field withName(Identifier fieldName) {
         @Nullable
         ProtoContainer<Option> options;
 
-        @Nullable
-        public List<Option> getOptions() {
+        public @Nullable List<Option> getOptions() {
             return options == null ? null : options.getElements();
         }
 
@@ -395,8 +393,7 @@ public Field withName(ProtoRightPadded<Identifier> name) {
                 return t.name == name ? t : new Field(t.id, t.prefix, t.markers, t.label, t.type, name, t.number, t.options);
             }
 
-            @Nullable
-            public ProtoContainer<Option> getOptions() {
+            public @Nullable ProtoContainer<Option> getOptions() {
                 return t.options;
             }
 
@@ -511,8 +508,7 @@ public EnumField withName(Identifier fieldName) {
         @Nullable
         ProtoContainer<Option> options;
 
-        @Nullable
-        public List<Option> getOptions() {
+        public @Nullable List<Option> getOptions() {
             return options == null ? null : options.getElements();
         }
 
@@ -552,8 +548,7 @@ public EnumField withName(ProtoRightPadded<Identifier> name) {
                 return t.name == name ? t : new EnumField(t.id, t.prefix, t.markers, name, t.number, t.options);
             }
 
-            @Nullable
-            public ProtoContainer<Option> getOptions() {
+            public @Nullable ProtoContainer<Option> getOptions() {
                 return t.options;
             }
 
@@ -588,13 +583,11 @@ class FullIdentifier implements FullName, TypeTree {
         @Nullable
         ProtoRightPadded<FullName> target;
 
-        @Nullable
-        public FullName getTarget() {
+        public @Nullable FullName getTarget() {
             return target == null ? null : target.getElement();
         }
 
-        @Nullable
-        public FullName withTarget(@Nullable FullName target) {
+        public @Nullable FullName withTarget(@Nullable FullName target) {
             if (target == null) {
                 return getPadding().withTarget(null);
             }
@@ -631,8 +624,7 @@ public Padding getPadding() {
         public static class Padding {
             private final FullIdentifier t;
 
-            @Nullable
-            public ProtoRightPadded<FullName> getTarget() {
+            public @Nullable ProtoRightPadded<FullName> getTarget() {
                 return t.target;
             }
 
@@ -808,8 +800,7 @@ public MapField withName(Identifier name) {
         @Nullable
         ProtoContainer<Option> options;
 
-        @Nullable
-        public List<Option> getOptions() {
+        public @Nullable List<Option> getOptions() {
             return options == null ? null : options.getElements();
         }
 
@@ -873,8 +864,7 @@ public MapField withName(ProtoRightPadded<Identifier> name) {
                 return t.name == name ? t : new MapField(t.id, t.prefix, t.markers, t.map, t.keyType, t.valueType, name, t.number, t.options);
             }
 
-            @Nullable
-            public ProtoContainer<Option> getOptions() {
+            public @Nullable ProtoContainer<Option> getOptions() {
                 return t.options;
             }
 
@@ -1196,8 +1186,7 @@ class Reserved implements Proto {
         @Nullable
         ProtoContainer<Proto> reservations;
 
-        @Nullable
-        public List<Proto> getReservations() {
+        public @Nullable List<Proto> getReservations() {
             return reservations == null ? null : reservations.getElements();
         }
 
@@ -1229,8 +1218,7 @@ public Padding getPadding() {
         public static class Padding {
             private final Reserved t;
 
-            @Nullable
-            public ProtoContainer<Proto> getReservations() {
+            public @Nullable ProtoContainer<Proto> getReservations() {
                 return t.reservations;
             }
 
@@ -1301,8 +1289,7 @@ public Padding getPadding() {
         public static class Padding {
             private final RpcInOut t;
 
-            @Nullable
-            public ProtoRightPadded<FullName> getType() {
+            public @Nullable ProtoRightPadded<FullName> getType() {
                 return t.type;
             }
 
diff --git a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/ProtoContainer.java b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/ProtoContainer.java
index 98dd252dcef..d30bd124685 100644
--- a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/ProtoContainer.java
+++ b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/ProtoContainer.java
@@ -111,8 +111,7 @@ public ProtoContainer<T> withElements(List<ProtoRightPadded<T>> elements) {
         }
     }
 
-    @Nullable
-    public static <P extends Proto> ProtoContainer<P> withElementsNullable(@Nullable ProtoContainer<P> before, @Nullable List<P> elements) {
+    public static <P extends Proto> @Nullable ProtoContainer<P> withElementsNullable(@Nullable ProtoContainer<P> before, @Nullable List<P> elements) {
         if (before == null) {
             if (elements == null || elements.isEmpty()) {
                 return null;
diff --git a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/ProtoLeftPadded.java b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/ProtoLeftPadded.java
index 6defd328d73..cb2fbcb9c71 100644
--- a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/ProtoLeftPadded.java
+++ b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/tree/ProtoLeftPadded.java
@@ -35,8 +35,7 @@ public ProtoLeftPadded<T> map(UnaryOperator<T> map) {
         return withElement(map.apply(element));
     }
 
-    @Nullable
-    public static <T> ProtoLeftPadded<T> withElement(@Nullable ProtoLeftPadded<T> before, @Nullable T elements) {
+    public static <T> @Nullable ProtoLeftPadded<T> withElement(@Nullable ProtoLeftPadded<T> before, @Nullable T elements) {
         if (before == null) {
             if (elements == null) {
                 return null;
diff --git a/rewrite-test/src/main/java/org/openrewrite/test/RewriteTest.java b/rewrite-test/src/main/java/org/openrewrite/test/RewriteTest.java
index c35629bb838..948989135bf 100644
--- a/rewrite-test/src/main/java/org/openrewrite/test/RewriteTest.java
+++ b/rewrite-test/src/main/java/org/openrewrite/test/RewriteTest.java
@@ -115,8 +115,7 @@ default void assertRecipesConfigure() {
      * @return always null, a method that better documents in code that a source file does not exist either
      * before or after a recipe run.
      */
-    @Nullable
-    default String doesNotExist() {
+    default @Nullable String doesNotExist() {
         return null;
     }
 
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/XPathMatcher.java b/rewrite-xml/src/main/java/org/openrewrite/xml/XPathMatcher.java
index b0a7955aac1..0e8d60ec444 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/XPathMatcher.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/XPathMatcher.java
@@ -235,8 +235,7 @@ public boolean matches(Cursor cursor) {
         }
     }
 
-    @Nullable
-    private String matchesElementWithConditionFunction(Matcher matcher, Xml.Tag tag, Cursor cursor) {
+    private @Nullable String matchesElementWithConditionFunction(Matcher matcher, Xml.Tag tag, Cursor cursor) {
         boolean isAttributeElement = matcher.group(1) != null;
         String element = matcher.group(2);
         String allConditions = matcher.group(3);
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/format/LineBreaksVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/format/LineBreaksVisitor.java
index 633d6410696..34c58d669b5 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/format/LineBreaksVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/format/LineBreaksVisitor.java
@@ -113,18 +113,16 @@ private String minimumLines(String whitespace, int min) {
         return minWhitespace;
     }
 
-    @Nullable
     @Override
-    public Xml postVisit(Xml tree, P p) {
+    public @Nullable Xml postVisit(Xml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Xml.Document.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Xml visit(@Nullable Tree tree, P p) {
+    public @Nullable Xml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Xml) tree;
         }
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/format/MinimumViableSpacingVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/format/MinimumViableSpacingVisitor.java
index 59e62b6cd56..3497b6f0d05 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/format/MinimumViableSpacingVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/format/MinimumViableSpacingVisitor.java
@@ -41,18 +41,16 @@ public Xml.Attribute visitAttribute(Xml.Attribute attribute, P p) {
         return a;
     }
 
-    @Nullable
     @Override
-    public Xml visit(@Nullable Tree tree, P p) {
+    public @Nullable Xml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Xml) tree;
         }
         return super.visit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Xml postVisit(Xml tree, P p) {
+    public @Nullable Xml postVisit(Xml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Xml.Document.class, "stop", true);
         }
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeFormatVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeFormatVisitor.java
index b0461bf3ffe..8fb1f4b765b 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeFormatVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeFormatVisitor.java
@@ -32,18 +32,16 @@ public NormalizeFormatVisitor(@Nullable Tree stopAfter) {
         this.stopAfter = stopAfter;
     }
 
-    @Nullable
     @Override
-    public Xml visit(@Nullable Tree tree, P p) {
+    public @Nullable Xml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Xml) tree;
         }
         return super.visit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Xml postVisit(Xml tree, P p) {
+    public @Nullable Xml postVisit(Xml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Xml.Document.class, "stop", true);
         }
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeLineBreaksVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeLineBreaksVisitor.java
index 5e567a3fcd0..12c8736af2a 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeLineBreaksVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeLineBreaksVisitor.java
@@ -36,9 +36,8 @@ public NormalizeLineBreaksVisitor(GeneralFormatStyle style, @Nullable Tree stopA
         this.stopAfter = stopAfter;
     }
 
-    @Nullable
     @Override
-    public Xml visit(@Nullable Tree tree, P p) {
+    public @Nullable Xml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Xml) tree;
         }
@@ -69,10 +68,8 @@ private static String normalizeNewLines(String text, boolean useCrlf) {
         return normalized.toString();
     }
 
-
-    @Nullable
     @Override
-    public Xml postVisit(Xml tree, P p) {
+    public @Nullable Xml postVisit(Xml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Xml.Document.class, "stop", true);
         }
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeTabsOrSpacesVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeTabsOrSpacesVisitor.java
index 37980305445..1133c28bfb4 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeTabsOrSpacesVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/format/NormalizeTabsOrSpacesVisitor.java
@@ -92,9 +92,8 @@ private String normalize(String text) {
         return text;
     }
 
-    @Nullable
     @Override
-    public Xml visit(@Nullable Tree tree, P p) {
+    public @Nullable Xml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Xml) tree;
         }
@@ -108,9 +107,8 @@ public Xml visit(@Nullable Tree tree, P p) {
         return super.visit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Xml postVisit(Xml tree, P p) {
+    public @Nullable Xml postVisit(Xml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Xml.Document.class, "stop", true);
         }
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/format/RemoveTrailingWhitespaceVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/format/RemoveTrailingWhitespaceVisitor.java
index 00c8d98f22b..eab837e0f75 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/format/RemoveTrailingWhitespaceVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/format/RemoveTrailingWhitespaceVisitor.java
@@ -43,18 +43,16 @@ public Xml.Document visitDocument(Xml.Document doc, P p) {
         return d.withEof(eof);
     }
 
-    @Nullable
     @Override
-    public Xml visit(@Nullable Tree tree, P p) {
+    public @Nullable Xml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Xml) tree;
         }
         return super.visit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Xml postVisit(Xml tree, P p) {
+    public @Nullable Xml postVisit(Xml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Xml.Document.class, "stop", true);
         }
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/format/TabsAndIndentsVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/format/TabsAndIndentsVisitor.java
index ca457a9b67c..34a4d041cef 100644
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/format/TabsAndIndentsVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/format/TabsAndIndentsVisitor.java
@@ -70,18 +70,16 @@ public Xml preVisit(Xml tree, P p) {
         return x;
     }
 
-    @Nullable
     @Override
-    public Xml postVisit(Xml tree, P p) {
+    public @Nullable Xml postVisit(Xml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Xml.Document.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Xml visit(@Nullable Tree tree, P p) {
+    public @Nullable Xml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Xml) tree;
         }
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/XmlParserVisitor.java b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/XmlParserVisitor.java
index 859818ee1b0..7d2b7d01e10 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/internal/XmlParserVisitor.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/internal/XmlParserVisitor.java
@@ -384,8 +384,7 @@ private String prefix(Token token) {
         return prefix;
     }
 
-    @Nullable
-    private <C extends ParserRuleContext, T> T convert(C ctx, BiFunction<C, String, T> conversion) {
+    private <C extends ParserRuleContext, T> @Nullable T convert(C ctx, BiFunction<C, String, T> conversion) {
         if (ctx == null) {
             return null;
         }
diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/search/FindTags.java b/rewrite-xml/src/main/java/org/openrewrite/xml/search/FindTags.java
index c9021c0694d..88f8aa3ac77 100755
--- a/rewrite-xml/src/main/java/org/openrewrite/xml/search/FindTags.java
+++ b/rewrite-xml/src/main/java/org/openrewrite/xml/search/FindTags.java
@@ -80,9 +80,8 @@ public Xml visitTag(Xml.Tag tag, Set<Xml.Tag> ts) {
      * Returns <code>null</code> if there is not exactly one tag matching this xPath
      */
     @SuppressWarnings("unused")
-    @Nullable
     @Incubating(since = "7.33.0")
-    public static Xml.Tag findSingle(Xml x, String xPath) {
+    public static @Nullable Xml.Tag findSingle(Xml x, String xPath) {
         final Set<Xml.Tag> tags = find(x, xPath);
         if (tags.size() != 1) {
             return null;
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 35170b1b20d..cc3ef8a1a44 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
@@ -50,8 +50,7 @@ default <R extends Tree, P> R accept(TreeVisitor<R, P> v, P p) {
         return (R) acceptXml(v.adapt(XmlVisitor.class), p);
     }
 
-    @Nullable
-    default <P> Xml acceptXml(XmlVisitor<P> v, P p) {
+    default <P> @Nullable Xml acceptXml(XmlVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }
 
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/ChangePropertyValue.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/ChangePropertyValue.java
index 11aed599ab6..98799dd5147 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/ChangePropertyValue.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/ChangePropertyValue.java
@@ -107,8 +107,8 @@ public Yaml.Mapping.Entry visitMappingEntry(Yaml.Mapping.Entry entry, ExecutionC
         });
     }
 
-    @Nullable // returns null if value should not change
-    private Yaml.Scalar updateValue(Yaml.Block value) {
+    // returns null if value should not change
+    private @Nullable Yaml.Scalar updateValue(Yaml.Block value) {
         if (!(value instanceof Yaml.Scalar)) {
             return null;
         }
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/JsonPathMatcher.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/JsonPathMatcher.java
index 645149b8048..1eac3d06124 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/JsonPathMatcher.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/JsonPathMatcher.java
@@ -647,8 +647,7 @@ public Object visitBinaryExpression(JsonPathParser.BinaryExpressionContext ctx)
             return null;
         }
 
-        @Nullable
-        private Object getBinaryExpressionResult(Object ctx) {
+        private @Nullable Object getBinaryExpressionResult(Object ctx) {
             if (ctx instanceof JsonPathParser.BinaryExpressionContext) {
                 ctx = visitBinaryExpression((JsonPathParser.BinaryExpressionContext) ctx);
 
@@ -668,8 +667,7 @@ private Object getBinaryExpressionResult(Object ctx) {
         }
 
         // Interpret the LHS to check the appropriate value.
-        @Nullable
-        private Yaml getOperatorResult(Object lhs, String operator, Object rhs) {
+        private @Nullable Yaml getOperatorResult(Object lhs, String operator, Object rhs) {
             if (lhs instanceof Yaml.Mapping) {
                 Yaml.Mapping mapping = (Yaml.Mapping) lhs;
                 for (Yaml.Mapping.Entry entry : mapping.getEntries()) {
@@ -714,8 +712,7 @@ private boolean checkObjectEquality(Object lhs, String operator, Object rhs) {
         }
 
         // Extract the result from YAML objects that can match by key.
-        @Nullable
-        public Object getResultByKey(Object result, String key) {
+        public @Nullable Object getResultByKey(Object result, String key) {
             if (result instanceof Yaml.Mapping.Entry) {
                 Yaml.Mapping.Entry member = (Yaml.Mapping.Entry) result;
                 if (member.getValue() instanceof Yaml.Scalar) {
@@ -746,8 +743,7 @@ private Object getResultFromList(Object results) {
         }
 
         // Extract the value from a Json object.
-        @Nullable
-        private Object getValue(Object result) {
+        private @Nullable Object getValue(Object result) {
             if (result instanceof Yaml.Mapping.Entry) {
                 return getValue(((Yaml.Mapping.Entry) result).getValue());
             } else if (result instanceof Yaml.Mapping) {
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/MergeYaml.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/MergeYaml.java
index cee6c9f7c6f..e4cff9e45d1 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/MergeYaml.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/MergeYaml.java
@@ -144,8 +144,7 @@ public String indent(String text) {
                 return text.replaceAll("(?m)^", padding.toString());
             }
 
-            @Nullable
-            private String maybeKeyFromJsonPath(String jsonPath) {
+            private @Nullable String maybeKeyFromJsonPath(String jsonPath) {
                 if (!jsonPath.startsWith("$.")) {
                     return null;
                 }
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/AutoFormatVisitor.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/AutoFormatVisitor.java
index 7ba7a8359db..c7889af15b6 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/AutoFormatVisitor.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/AutoFormatVisitor.java
@@ -74,18 +74,16 @@ public Yaml.Documents visitDocuments(Yaml.Documents documents, P p) {
         return y;
     }
 
-    @Nullable
     @Override
-    public Yaml postVisit(Yaml tree, P p) {
+    public @Nullable Yaml postVisit(Yaml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Yaml.Documents.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Yaml visit(@Nullable Tree tree, P p) {
+    public @Nullable Yaml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Yaml) tree;
         }
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/IndentsVisitor.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/IndentsVisitor.java
index 3e1a7eb4531..0d33b91f4d6 100755
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/IndentsVisitor.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/IndentsVisitor.java
@@ -36,9 +36,8 @@ public IndentsVisitor(IndentsStyle style, @Nullable Tree stopAfter) {
         this.stopAfter = stopAfter;
     }
 
-    @Nullable
     @Override
-    public Yaml visit(@Nullable Tree tree, P p, Cursor parent) {
+    public @Nullable Yaml visit(@Nullable Tree tree, P p, Cursor parent) {
         setCursor(parent);
         for (Cursor c = parent; c != null && c.getValue() instanceof Yaml; c = c.getParent()) {
             Yaml y = c.getValue();
@@ -58,9 +57,8 @@ public Yaml visit(@Nullable Tree tree, P p, Cursor parent) {
         return visit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Yaml preVisit(Yaml tree, P p) {
+    public @Nullable Yaml preVisit(Yaml tree, P p) {
         if (getCursor().getNearestMessage("stop", false)) {
             return tree;
         }
@@ -97,18 +95,16 @@ private boolean isUnindentedTopLevel() {
                 getCursor().getParentOrThrow(2).getValue() instanceof Yaml.Document;
     }
 
-    @Nullable
     @Override
-    public Yaml postVisit(Yaml tree, P p) {
+    public @Nullable Yaml postVisit(Yaml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Yaml.Documents.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Yaml visit(@Nullable Tree tree, P p) {
+    public @Nullable Yaml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Yaml) tree;
         }
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/MinimumViableSpacingVisitor.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/MinimumViableSpacingVisitor.java
index bb010ddfcf4..c9522f6e4ee 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/MinimumViableSpacingVisitor.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/MinimumViableSpacingVisitor.java
@@ -58,18 +58,16 @@ public Yaml.Sequence.Entry visitSequenceEntry(Yaml.Sequence.Entry entry, P p) {
         return e;
     }
 
-    @Nullable
     @Override
-    public Yaml postVisit(Yaml tree, P p) {
+    public @Nullable Yaml postVisit(Yaml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Yaml.Documents.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Yaml visit(@Nullable Tree tree, P p) {
+    public @Nullable Yaml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Yaml) tree;
         }
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/NormalizeFormatVisitor.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/NormalizeFormatVisitor.java
index 29a832f258c..60bf61ca199 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/NormalizeFormatVisitor.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/NormalizeFormatVisitor.java
@@ -37,18 +37,16 @@ public Yaml.Mapping.Entry visitMappingEntry(Yaml.Mapping.Entry entry, P p) {
         return e;
     }
 
-    @Nullable
     @Override
-    public Yaml postVisit(Yaml tree, P p) {
+    public @Nullable Yaml postVisit(Yaml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Yaml.Documents.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Yaml visit(@Nullable Tree tree, P p) {
+    public @Nullable Yaml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Yaml) tree;
         }
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/NormalizeLineBreaksVisitor.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/NormalizeLineBreaksVisitor.java
index 55598f2fcc6..da5eef96ea7 100644
--- a/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/NormalizeLineBreaksVisitor.java
+++ b/rewrite-yaml/src/main/java/org/openrewrite/yaml/format/NormalizeLineBreaksVisitor.java
@@ -32,18 +32,16 @@ public NormalizeLineBreaksVisitor(GeneralFormatStyle generalFormatStyle, @Nullab
         this.stopAfter = stopAfter;
     }
 
-    @Nullable
     @Override
-    public Yaml postVisit(Yaml tree, P p) {
+    public @Nullable Yaml postVisit(Yaml tree, P p) {
         if (stopAfter != null && stopAfter.isScope(tree)) {
             getCursor().putMessageOnFirstEnclosing(Yaml.Documents.class, "stop", true);
         }
         return super.postVisit(tree, p);
     }
 
-    @Nullable
     @Override
-    public Yaml visit(@Nullable Tree tree, P p) {
+    public @Nullable Yaml visit(@Nullable Tree tree, P p) {
         if (getCursor().getNearestMessage("stop") != null) {
             return (Yaml) tree;
         }
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 c9dd6027661..6919e9a2725 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
@@ -45,8 +45,7 @@ default <P> boolean isAcceptable(TreeVisitor<?, P> v, P p) {
         return v.isAdaptableTo(YamlVisitor.class);
     }
 
-    @Nullable
-    default <P> Yaml acceptYaml(YamlVisitor<P> v, P p) {
+    default <P> @Nullable Yaml acceptYaml(YamlVisitor<P> v, P p) {
         return v.defaultValue(this, p);
     }