Migrate Traits class usage to constructor calls (#5613)

MBoegers · TeamModerne · timtebeek · web-flow · commit a998126386e6 · 2025-07-07T19:49:38.000+02:00
* Migrate Traits class usage to constructor calls

Co-authored-by: Moderne &lt;team@moderne.io&gt;

* add deprecation marking to `org.openrewrite.maven.trait.Traits`, `org.openrewrite.gradle.trait.Traits`
and `org.openrewrite.java.trait.Traits`

* fix missed static imports

---------

Co-authored-by: Moderne &lt;team@moderne.io&gt;
Co-authored-by: Tim te Beek &lt;tim@moderne.io&gt;
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependency.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependency.java
@@ -27,7 +27,6 @@
 import org.openrewrite.gradle.marker.GradleProject;
 import org.openrewrite.gradle.search.FindGradleProject;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
 import org.openrewrite.internal.StringUtils;
@@ -185,7 +184,7 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
 
-                GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency()
+                GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
                         .groupId(oldGroupId)
                         .artifactId(oldArtifactId);
 
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyArtifactId.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyArtifactId.java
@@ -25,7 +25,6 @@
 import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
 import org.openrewrite.gradle.marker.GradleProject;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.GroovyIsoVisitor;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
@@ -113,7 +112,7 @@ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionCon
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
 
-                GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency()
+                GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
                         .configuration(configuration)
                         .groupId(groupId)
                         .artifactId(artifactId);
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyClassifier.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyClassifier.java
@@ -25,7 +25,6 @@
 import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
 import org.openrewrite.gradle.marker.GradleProject;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.GroovyIsoVisitor;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
@@ -111,7 +110,7 @@ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionCon
             @Override
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
-                GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency()
+                GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
                         .configuration(configuration)
                         .groupId(groupId)
                         .artifactId(artifactId);
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyConfiguration.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyConfiguration.java
@@ -22,7 +22,6 @@
 import org.openrewrite.gradle.internal.Dependency;
 import org.openrewrite.gradle.internal.DependencyStringNotationConverter;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.GroovyIsoVisitor;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.StringUtils;
@@ -95,7 +94,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
 
-                GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency()
+                GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
                         .configuration(configuration);
 
                 if (!gradleDependencyMatcher.get(getCursor()).isPresent() && !matchesOtherDependency(m)) {
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyExtension.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyExtension.java
@@ -23,7 +23,6 @@
 import org.openrewrite.gradle.internal.Dependency;
 import org.openrewrite.gradle.internal.DependencyStringNotationConverter;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.GroovyIsoVisitor;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
@@ -85,7 +84,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
 
-                GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency()
+                GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
                         .configuration(configuration)
                         .groupId(groupId)
                         .artifactId(artifactId);
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyGroupId.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyGroupId.java
@@ -25,7 +25,6 @@
 import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
 import org.openrewrite.gradle.marker.GradleProject;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.GroovyIsoVisitor;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
@@ -113,7 +112,7 @@ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionCon
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
 
-                GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency()
+                GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
                         .configuration(configuration)
                         .groupId(groupId)
                         .artifactId(artifactId);
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseMapNotation.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseMapNotation.java
@@ -19,7 +19,6 @@
 import org.openrewrite.gradle.internal.Dependency;
 import org.openrewrite.gradle.internal.DependencyStringNotationConverter;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.GroovyVisitor;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
@@ -62,7 +61,7 @@ private static class KotlinScriptVisitor extends KotlinVisitor<ExecutionContext>
         public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
             J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
 
-            GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency();
+            GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
 
             if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
                 return m;
@@ -94,7 +93,7 @@ private static class GroovyScriptVisitor extends GroovyVisitor<ExecutionContext>
         public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
             J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
 
-            GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency();
+            GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
 
             if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
                 return m;
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java
@@ -21,7 +21,6 @@
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.tree.Expression;
@@ -55,7 +54,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
 
-                GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency();
+                GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
 
                 if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
                     return m;
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveDependency.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveDependency.java
@@ -22,7 +22,6 @@
 import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
 import org.openrewrite.gradle.marker.GradleProject;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
 import org.openrewrite.internal.StringUtils;
@@ -77,7 +76,7 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return Preconditions.check(new IsBuildGradle<>(), new JavaIsoVisitor<ExecutionContext>() {
-            final GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency()
+            final GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
                     .configuration(configuration)
                     .groupId(groupId)
                     .artifactId(artifactId);
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveRedundantDependencyVersions.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveRedundantDependencyVersions.java
@@ -25,7 +25,6 @@
 import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
 import org.openrewrite.gradle.marker.GradleProject;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
 import org.openrewrite.internal.StringUtils;
@@ -395,7 +394,7 @@ boolean shouldRemoveRedundantConstraint(@Nullable Dependency constraint, @Nullab
                     public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                         J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
 
-                        Optional<GradleDependency> maybeGradleDependency = Traits.gradleDependency()
+                        Optional<GradleDependency> maybeGradleDependency = new GradleDependency.Matcher()
                                 .groupId(groupPattern)
                                 .artifactId(artifactPattern)
                                 .get(getCursor());
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeDependencyVersion.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeDependencyVersion.java
@@ -27,7 +27,6 @@
 import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
 import org.openrewrite.gradle.marker.GradleProject;
 import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.trait.Traits;
 import org.openrewrite.groovy.tree.G;
 import org.openrewrite.internal.ListUtils;
 import org.openrewrite.internal.StringUtils;
@@ -171,7 +170,7 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
             @Override
             public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
-                GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency();
+                GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
 
                 if (gradleDependencyMatcher.get(getCursor()).isPresent()) {
                     if (m.getArguments().get(0) instanceof G.MapEntry) {
@@ -542,7 +541,7 @@ public J postVisit(J tree, ExecutionContext ctx) {
         @Override
         public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
             J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
-            GradleDependency.Matcher gradleDependencyMatcher = Traits.gradleDependency();
+            GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
 
             if (gradleDependencyMatcher.get(getCursor()).isPresent()) {
                 List<Expression> depArgs = m.getArguments();
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/internal/AddDependencyVisitor.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/internal/AddDependencyVisitor.java
@@ -54,7 +54,6 @@
 import static java.util.Objects.requireNonNull;
 import static org.openrewrite.gradle.AddDependencyVisitor.DependencyModifier.ENFORCED_PLATFORM;
 import static org.openrewrite.gradle.AddDependencyVisitor.DependencyModifier.PLATFORM;
-import static org.openrewrite.gradle.trait.Traits.gradleDependency;
 
 @RequiredArgsConstructor
 public class AddDependencyVisitor extends JavaIsoVisitor<ExecutionContext> {
@@ -135,7 +134,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 return m;
             }
 
-            Optional<GradleDependency> maybeDependency = gradleDependency()
+            Optional<GradleDependency> maybeDependency = new GradleDependency.Matcher()
                     .configuration(configuration)
                     .groupId(groupId)
                     .artifactId(artifactId)
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/search/DependencyInsight.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/search/DependencyInsight.java
@@ -23,7 +23,7 @@
 import org.openrewrite.*;
 import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
 import org.openrewrite.gradle.marker.GradleProject;
-import org.openrewrite.gradle.trait.Traits;
+import org.openrewrite.gradle.trait.GradleDependency;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.marker.JavaProject;
@@ -231,7 +231,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             }
 
             if (configurationToDirectDependency.containsKey(m.getSimpleName())) {
-                return Traits.gradleDependency().get(getCursor()).map(dependency -> {
+                return new GradleDependency.Matcher().get(getCursor()).map(dependency -> {
                     ResolvedGroupArtifactVersion gav = dependency.getResolvedDependency().getGav();
                     Optional<GroupArtifactVersion> configurationGav = configurationToDirectDependency.get(m.getSimpleName()).stream()
                             .filter(dep -> dep.asGroupArtifact().equals(gav.asGroupArtifact()))
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/search/FindJVMTestSuites.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/search/FindJVMTestSuites.java
@@ -28,8 +28,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.openrewrite.gradle.trait.Traits.jvmTestSuite;
-
 @Value
 @EqualsAndHashCode(callSuper = false)
 public class FindJVMTestSuites extends Recipe {
@@ -54,7 +52,7 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         boolean tableAvailable = this.insertRows == null || this.insertRows;
-        return Preconditions.check(new IsBuildGradle<>(), jvmTestSuite().asVisitor((suite, ctx) -> {
+        return Preconditions.check(new IsBuildGradle<>(), new JvmTestSuite.Matcher().asVisitor((suite, ctx) -> {
             if (tableAvailable) {
                 jvmTestSuitesDefined.insertRow(ctx, new JVMTestSuitesDefined.Row(suite.getName()));
             }
@@ -67,7 +65,7 @@ public static Set<JvmTestSuite> jvmTestSuites(SourceFile sourceFile) {
             return Collections.emptySet();
         }
 
-        return jvmTestSuite().lower(sourceFile)
+        return new JvmTestSuite.Matcher().lower(sourceFile)
                 .collect(Collectors.toSet());
     }
 }
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/trait/Traits.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/trait/Traits.java
@@ -15,14 +15,26 @@
  */
 package org.openrewrite.gradle.trait;
 
+/**
+ * @deprecated Use specific matchers like {@link GradleDependency.Matcher} or {@link JvmTestSuite.Matcher} instead.
+ */
+@Deprecated
 public class Traits {
     private Traits() {
     }
 
+    /**
+     * @deprecated Use {@link GradleDependency.Matcher} instead.
+     */
+    @Deprecated
     public static GradleDependency.Matcher gradleDependency() {
         return new GradleDependency.Matcher();
     }
 
+    /**
+     * @deprecated Use {@link JvmTestSuite.Matcher} instead.
+     */
+    @Deprecated
     public static JvmTestSuite.Matcher jvmTestSuite() {
         return new JvmTestSuite.Matcher();
     }
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/trait/GradleDependencyTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/trait/GradleDependencyTest.java
@@ -26,13 +26,12 @@
 
 import static org.openrewrite.gradle.Assertions.buildGradle;
 import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;
-import static org.openrewrite.gradle.trait.Traits.gradleDependency;
 
 class GradleDependencyTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .recipe(RewriteTest.toRecipe(() -> gradleDependency().asVisitor(dep ->
+          .recipe(RewriteTest.toRecipe(() -> new GradleDependency.Matcher().asVisitor(dep ->
             SearchResult.found(dep.getTree(), dep.getResolvedDependency().getGav().toString()))));
     }
 
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/trait/JvmTestSuiteTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/trait/JvmTestSuiteTest.java
@@ -26,13 +26,12 @@
 import static org.openrewrite.gradle.Assertions.buildGradle;
 import static org.openrewrite.gradle.Assertions.buildGradleKts;
 import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;
-import static org.openrewrite.gradle.trait.Traits.jvmTestSuite;
 
 class JvmTestSuiteTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec.beforeRecipe(withToolingApi())
-          .recipe(RewriteTest.toRecipe(() -> jvmTestSuite().asVisitor(suite ->
+          .recipe(RewriteTest.toRecipe(() -> new JvmTestSuite.Matcher().asVisitor(suite ->
             SearchResult.found(suite.getTree()))));
     }
 
@@ -98,7 +97,7 @@ implementation project()
         @Test
         void findByName() {
             rewriteRun(
-              spec -> spec.recipe(RewriteTest.toRecipe(() -> jvmTestSuite().name("integrationTest").asVisitor(suite ->
+              spec -> spec.recipe(RewriteTest.toRecipe(() -> new JvmTestSuite.Matcher().name("integrationTest").asVisitor(suite ->
                 SearchResult.found(suite.getTree())))),
               buildGradle(
                 """
@@ -156,7 +155,7 @@ implementation project()
         @Test
         void addDependency() {
             rewriteRun(
-              spec -> spec.recipe(RewriteTest.toRecipe((recipe) -> jvmTestSuite().asVisitor((suite, ctx) ->
+              spec -> spec.recipe(RewriteTest.toRecipe((recipe) -> new JvmTestSuite.Matcher().asVisitor((suite, ctx) ->
                 suite.addDependency("implementation", "com.google.guava", "guava", "29.0-jre", null, null, null, new MavenMetadataFailures(recipe), null, ctx).visitNonNull(suite.getTree(), ctx, suite.getCursor().getParentOrThrow())))),
               buildGradle(
                 """
@@ -291,7 +290,7 @@ val functionalTest by registering(JvmTestSuite::class) {
         @Test
         void findByName() {
             rewriteRun(
-              spec -> spec.recipe(RewriteTest.toRecipe(() -> jvmTestSuite().name("integrationTest").asVisitor(suite ->
+              spec -> spec.recipe(RewriteTest.toRecipe(() -> new JvmTestSuite.Matcher().name("integrationTest").asVisitor(suite ->
                 SearchResult.found(suite.getTree())))),
               buildGradleKts(
                 """
@@ -349,7 +348,7 @@ val test by getting(JvmTestSuite::class) {
         @Test
         void addDependency() {
             rewriteRun(
-              spec -> spec.recipe(RewriteTest.toRecipe((recipe) -> jvmTestSuite().asVisitor((suite, ctx) ->
+              spec -> spec.recipe(RewriteTest.toRecipe((recipe) -> new JvmTestSuite.Matcher().asVisitor((suite, ctx) ->
                 suite.addDependency("implementation", "com.google.guava", "guava", "29.0-jre", null, null, null, new MavenMetadataFailures(recipe), null, ctx).visitNonNull(suite.getTree(), ctx, suite.getCursor().getParentOrThrow())))),
               buildGradleKts(
                 """
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ReplaceMethodInvocationWithConstant.java b/rewrite-java/src/main/java/org/openrewrite/java/ReplaceMethodInvocationWithConstant.java
@@ -19,7 +19,7 @@
 import lombok.Value;
 import org.openrewrite.*;
 import org.openrewrite.java.search.UsesMethod;
-import org.openrewrite.java.trait.Traits;
+import org.openrewrite.java.trait.MethodAccess;
 import org.openrewrite.java.tree.Expression;
 
 @Value
@@ -50,7 +50,7 @@ public String getDescription() {
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return Preconditions.check(
                 new UsesMethod<>(methodPattern),
-                Traits.methodAccess(methodPattern)
+                new MethodAccess.Matcher(methodPattern)
                         .asVisitor(ma ->
                                 JavaTemplate.apply(replacement, ma.getCursor(),
                                         ((Expression) ma.getCursor().getValue()).getCoordinates().replace())));
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/trait/Traits.java b/rewrite-java/src/main/java/org/openrewrite/java/trait/Traits.java
diff --git a/rewrite-java/src/test/java/org/openrewrite/java/trait/AnnotatedTest.java b/rewrite-java/src/test/java/org/openrewrite/java/trait/AnnotatedTest.java
diff --git a/rewrite-java/src/test/java/org/openrewrite/java/trait/LiteralTest.java b/rewrite-java/src/test/java/org/openrewrite/java/trait/LiteralTest.java
diff --git a/rewrite-java/src/test/java/org/openrewrite/java/trait/MethodAccessTest.java b/rewrite-java/src/test/java/org/openrewrite/java/trait/MethodAccessTest.java
diff --git a/rewrite-java/src/test/java/org/openrewrite/java/trait/VariableAccessTest.java b/rewrite-java/src/test/java/org/openrewrite/java/trait/VariableAccessTest.java
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/AddAnnotationProcessor.java b/rewrite-maven/src/main/java/org/openrewrite/maven/AddAnnotationProcessor.java
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/trait/Traits.java b/rewrite-maven/src/main/java/org/openrewrite/maven/trait/Traits.java
diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/trait/MavenDependencyTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/trait/MavenDependencyTest.java
diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/trait/MavenPluginTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/trait/MavenPluginTest.java
