Minor polish

openrewrite · Sep 3, 2024 · 6b0812e · 6b0812e
1 parent 0c865bd
commit 6b0812e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/src/main/java/org/openrewrite/java/spring/data/RefactorSimpleMongoDbFactory.java b/src/main/java/org/openrewrite/java/spring/data/RefactorSimpleMongoDbFactory.java
@@ -19,22 +19,23 @@
 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;
 
 @RecipeDescriptor(
-        name = "Refactor `SimpleMongoDbFactory(new MongoClientURI(String))` to `SimpleMongoClientDbFactory(String)`",
-        description = "As part of spring-data-mongodb 2.3 migration the deprecated usage of `SimpleMongoDbFactory(new MongoClientURI(String))` has to be refactored to use `SimpleMongoClientDbFactory`"
-)
+        name = "Use `new SimpleMongoClientDbFactory(String)`",
+        description = "Replace usage of deprecated `new SimpleMongoDbFactory(new MongoClientURI(String))` with `new SimpleMongoClientDbFactory(String)`.")
+@SuppressWarnings("deprecation")
 public class RefactorSimpleMongoDbFactory {
 
     @BeforeTemplate
-    public SimpleMongoDbFactory before(String uri) {
+    public MongoDbFactory before(String uri) {
         return new SimpleMongoDbFactory(new MongoClientURI(uri));
     }
 
     @AfterTemplate
-    public SimpleMongoClientDbFactory after(String uri) {
+    public MongoDbFactory after(String uri) {
         return new SimpleMongoClientDbFactory(uri);
     }
 }
diff --git a/src/main/resources/META-INF/rewrite/spring-data-23.yml b/src/main/resources/META-INF/rewrite/spring-data-23.yml
@@ -19,7 +19,7 @@
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.spring.data.UpgradeSpringData_2_3
-displayName: Migrate to Spring Data 2.3 local
+displayName: Migrate to Spring Data 2.3
 description: Migrate applications to the latest Spring Data 2.3 release.
 recipeList:
   - org.openrewrite.java.spring.data.MigrateJpaSort

diff --git a/...pringBoot_2_3/java/org/openrewrite/java/spring/data/RefactorSimpleMongoDbFactoryTest.java b/...pringBoot_2_3/java/org/openrewrite/java/spring/data/RefactorSimpleMongoDbFactoryTest.java
@@ -33,6 +33,7 @@ public void defaults(RecipeSpec spec) {
 
     @DocumentExample
     @Test
+    @SuppressWarnings("deprecation")
     void constructorWithAttribute() {
         //language=java
         rewriteRun(
@@ -43,11 +44,8 @@ void constructorWithAttribute() {
               import com.mongodb.MongoClientURI;
 
               class Test {
-                  MongoDbFactory factory;
-                  SimpleMongoDbFactory factory2;
-
-                  void setupUri(String uri) {
-                      factory2 = new SimpleMongoDbFactory(new MongoClientURI(uri));
+                  MongoDbFactory setupUri(String uri) {
+                      return new SimpleMongoDbFactory(new MongoClientURI(uri));
                   }
               }
               """,
@@ -56,11 +54,8 @@ void setupUri(String uri) {
               import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 
               class Test {
-                  MongoDatabaseFactory factory;
-                  SimpleMongoClientDatabaseFactory factory2;
-
-                  void setupUri(String uri) {
-                      factory2 = new SimpleMongoClientDatabaseFactory(uri);
+                  MongoDatabaseFactory setupUri(String uri) {
+                      return new SimpleMongoClientDatabaseFactory(uri);
                   }
               }
               """