Cover more edge cases

beckermarc · Mar 22, 2024 · a46ccb2 · a46ccb2
1 parent 7bd1cbf
commit a46ccb2
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sap.openrewrite.recipe</groupId>
     <artifactId>cap-java-recipes</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/src/main/java/com/sap/openrewrite/recipe/RequestContexRunnerRules.java b/src/main/java/com/sap/openrewrite/recipe/RequestContexRunnerRules.java
@@ -9,9 +9,9 @@
 public class RequestContexRunnerRules {
 
 	@RecipeDescriptor(
-			name = "Replaces setTenant() with systemUser()",
+			name = "Replaces setTenant() with systemUser() using u as lambda name",
 			description = "Descriptions")
-	public static class SetTenantToSystemUser {
+	public static class SetTenantToSystemUserWithU {
 
 		@BeforeTemplate
 		public RequestContextRunner modifyUserBefore(RequestContextRunner runner, String tenant) {
@@ -25,4 +25,21 @@ public RequestContextRunner systemUserAfter(RequestContextRunner runner, String
 
 	}
 
+	@RecipeDescriptor(
+		name = "Replaces setTenant() with systemUser() using user as lambda name",
+		description = "Descriptions")
+	public static class SetTenantToSystemUserWithUser {
+
+		@BeforeTemplate
+		public RequestContextRunner modifyUserBefore(RequestContextRunner runner, String tenant) {
+			return runner.modifyUser(user -> user.setTenant(tenant));
+		}
+
+		@AfterTemplate
+		public RequestContextRunner systemUserAfter(RequestContextRunner runner, String tenant) {
+			return runner.systemUser(tenant);
+		}
+
+	}
+
 }
diff --git a/src/test/java/com/sap/openrewrite/recipe/RequestContextRunnerRulesTest.java b/src/test/java/com/sap/openrewrite/recipe/RequestContextRunnerRulesTest.java
@@ -15,20 +15,49 @@ public void defaults(RecipeSpec spec) {
     }
 
     @Test
-    void testReplaceModifyUser() {
+    void testReplaceModifyUserWithU() {
         rewriteRun(
             java(
+                """
+                    import com.sap.cds.services.runtime.RequestContextRunner;
+                    import java.util.Map;
+
+                    class Test {
+
+                        void test(RequestContextRunner cdsContextRunner, Map<String, String> map) {
+                            cdsContextRunner.modifyUser(u -> u.setTenant(map.get("test").toString()));
+                        }
+                    }
+                """,
+                """
+                    import com.sap.cds.services.runtime.RequestContextRunner;
+                    import java.util.Map;
+
+                    class Test {
+
+                        void test(RequestContextRunner cdsContextRunner, Map<String, String> map) {
+                            cdsContextRunner.systemUser(map.get("test").toString());
+                        }
+                    }
+                """
+            )
+        );
+
+    }
 
+    @Test
+    void testReplaceModifyUserWithUser() {
+        rewriteRun(
+            java(
                 """
                     import com.sap.cds.services.runtime.CdsRuntime;
 
                     class Test {
 
                         void test(CdsRuntime runtime) {
-                            String test = "test";
-                            runtime.requestContext().modifyUser(u -> u.setTenant(test));
+                            String test = "tenant";
+                            runtime.requestContext().modifyUser(user -> user.setTenant(test));
                         }
-
                     }
                 """,
                 """
@@ -37,10 +66,9 @@ void test(CdsRuntime runtime) {
                     class Test {
 
                         void test(CdsRuntime runtime) {
-                            String test = "test";
+                            String test = "tenant";
                             runtime.requestContext().systemUser(test);
                         }
-
                     }
                 """
             )
@@ -49,3 +77,4 @@ void test(CdsRuntime runtime) {
     }
 
 }
+