Merge branch 'main' into httpsecurity

openrewrite · Nov 15, 2024 · 193095a · 193095a
2 parents 10236c9 + 1c8d450
commit 193095a
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 103 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -87,6 +87,8 @@ recipeDependencies {
     parserClasspath("org.springframework.data:spring-data-commons:1.+")
     parserClasspath("org.springframework.data:spring-data-jpa:2.+")
     parserClasspath("org.springframework.data:spring-data-jpa:2.3.+")
+    parserClasspath("org.springframework.data:spring-data-mongodb:2.2.+")
+    parserClasspath("org.mongodb:mongo-java-driver:3.12.+")
 
     parserClasspath("org.springframework.batch:spring-batch-core:4.+")
     parserClasspath("org.springframework.batch:spring-batch-core:5.+")
@@ -147,16 +149,6 @@ dependencies {
     runtimeOnly("org.openrewrite.recipe:rewrite-reactive-streams:$rewriteVersion")
     runtimeOnly("org.openrewrite.recipe:rewrite-testing-frameworks:$rewriteVersion")
 
-    annotationProcessor("org.openrewrite:rewrite-templating:$rewriteVersion")
-    compileOnly("com.google.errorprone:error_prone_core:2.+") {
-        exclude("com.google.auto.service", "auto-service-annotations")
-    }
-    implementation("org.mongodb:mongo-java-driver:3.12.+")
-    implementation("org.springframework.data:spring-data-mongodb:2.2.+"){
-        because("We only require the classes (for refaster style recipes), not the dependencies")
-        exclude(group = "org.springframework")
-    }
-
     testRuntimeOnly("ch.qos.logback:logback-classic:1.+")
     testRuntimeOnly(gradleApi())
 

diff --git a/src/main/java/org/openrewrite/java/spring/RemoveMethodInvocationsVisitor.java b/src/main/java/org/openrewrite/java/spring/RemoveMethodInvocationsVisitor.java
diff --git a/src/main/java/org/openrewrite/java/spring/data/RefactorSimpleMongoDbFactory.java b/src/main/java/org/openrewrite/java/spring/data/RefactorSimpleMongoDbFactory.java
@@ -15,27 +15,64 @@
  */
 package org.openrewrite.java.spring.data;
 
-import com.google.errorprone.refaster.annotation.AfterTemplate;
-import com.google.errorprone.refaster.annotation.BeforeTemplate;
-import com.mongodb.MongoClientURI;
-import org.openrewrite.java.template.RecipeDescriptor;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Preconditions;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.java.*;
+import org.openrewrite.java.search.UsesMethod;
+import org.openrewrite.java.tree.Expression;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.MethodCall;
 
-@RecipeDescriptor(
-        name = "Use `new SimpleMongoClientDbFactory(String)`",
-        description = "Replace usage of deprecated `new SimpleMongoDbFactory(new MongoClientURI(String))` with `new SimpleMongoClientDbFactory(String)`.")
-@SuppressWarnings("deprecation")
-public class RefactorSimpleMongoDbFactory {
+public class RefactorSimpleMongoDbFactory extends Recipe {
 
-    @BeforeTemplate
-    public MongoDbFactory before(String uri) {
-        return new SimpleMongoDbFactory(new MongoClientURI(uri));
+    private static final String COM_MONGODB_MONGO_CLIENT_URI = "com.mongodb.MongoClientURI";
+    private static final String SIMPLE_MONGO_DB_FACTORY = "org.springframework.data.mongodb.core.SimpleMongoDbFactory";
+    private static final MethodMatcher SIMPLE_FACTORY_CONSTRUCTOR = new MethodMatcher(SIMPLE_MONGO_DB_FACTORY + " <constructor>(..)", true);
+    private static final MethodMatcher MONGO_CLIENT_CONSTRUCTOR = new MethodMatcher(COM_MONGODB_MONGO_CLIENT_URI + " <constructor>(String)", true);
+
+    private static final String SIMPLE_MONGO_CLIENT_DB_FACTORY = "org.springframework.data.mongodb.core.SimpleMongoClientDbFactory";
+
+    @Override
+    public String getDisplayName() {
+        return "Use `new SimpleMongoClientDbFactory(String)`";
+    }
+
+    @Override
+    public String getDescription() {
+        return "Replace usage of deprecated `new SimpleMongoDbFactory(new MongoClientURI(String))` with `new SimpleMongoClientDbFactory(String)`.";
     }
 
-    @AfterTemplate
-    public MongoDbFactory after(String uri) {
-        return new SimpleMongoClientDbFactory(uri);
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
+        JavaVisitor<ExecutionContext> javaVisitor = new JavaIsoVisitor<ExecutionContext>() {
+            @Override
+            public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
+                if (SIMPLE_FACTORY_CONSTRUCTOR.matches(newClass)) {
+                    Expression expression = newClass.getArguments().get(0);
+                    if (MONGO_CLIENT_CONSTRUCTOR.matches(expression)) {
+                        Expression uri = ((MethodCall) expression).getArguments().get(0);
+                        maybeRemoveImport(SIMPLE_MONGO_DB_FACTORY);
+                        maybeRemoveImport(COM_MONGODB_MONGO_CLIENT_URI);
+                        maybeAddImport(SIMPLE_MONGO_CLIENT_DB_FACTORY);
+                        return JavaTemplate
+                                .builder("new SimpleMongoClientDbFactory(#{any(java.lang.String)})")
+                                .imports(SIMPLE_MONGO_CLIENT_DB_FACTORY)
+                                .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "spring-data-mongodb-2", "mongo-java-driver"))
+                                .build()
+                                .apply(getCursor(), newClass.getCoordinates().replace(), uri);
+                    }
+                }
+                return super.visitNewClass(newClass, ctx);
+            }
+        };
+        return Preconditions.check(
+                Preconditions.and(
+                        new UsesMethod<>(SIMPLE_FACTORY_CONSTRUCTOR),
+                        new UsesMethod<>(MONGO_CLIENT_CONSTRUCTOR)
+                ),
+                javaVisitor
+        );
     }
 }
diff --git a/src/main/resources/META-INF/rewrite/classpath/mongo-java-driver-3.12.14.jar b/src/main/resources/META-INF/rewrite/classpath/mongo-java-driver-3.12.14.jar
diff --git a/src/main/resources/META-INF/rewrite/classpath/spring-data-mongodb-2.2.12.RELEASE.jar b/src/main/resources/META-INF/rewrite/classpath/spring-data-mongodb-2.2.12.RELEASE.jar
diff --git a/src/main/resources/META-INF/rewrite/spring-data-23.yml b/src/main/resources/META-INF/rewrite/spring-data-23.yml
@@ -28,7 +28,7 @@ recipeList:
       artifactId: mongodb-driver-legacy
       version: 5.1.x
       onlyIfUsing: com.mongodb.MongoClientURI
-  - org.openrewrite.java.spring.data.RefactorSimpleMongoDbFactoryRecipe
+  - org.openrewrite.java.spring.data.RefactorSimpleMongoDbFactory
   - org.openrewrite.java.ChangeType:
       oldFullyQualifiedTypeName: org.springframework.data.mongodb.MongoDbFactory
       newFullyQualifiedTypeName: org.springframework.data.mongodb.MongoDatabaseFactory