Adjust RefasterTemplateProcessor for new JavaTemplate API

openrewrite · Jun 1, 2023 · fb8089b · fb8089b
1 parent e970ef4
commit fb8089b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/openrewrite/java/template/RefasterTemplateProcessor.java b/src/main/java/org/openrewrite/java/template/RefasterTemplateProcessor.java
@@ -258,12 +258,12 @@ public void visitClassDef(JCTree.JCClassDecl classDecl) {
                             recipe.append("                }\n");
                         }
                         recipe.append("                JavaTemplate.Matcher matcher;\n");
-                        String predicate = befores.keySet().stream().map(b -> "(matcher = " + b + ".matcher(elem)).find()").collect(Collectors.joining(" || "));
+                        String predicate = befores.keySet().stream().map(b -> "(matcher = " + b + ".matcher(getCursor())).find()").collect(Collectors.joining(" || "));
                         recipe.append("                if (" + predicate + ") {\n");
                         if (parameters.isEmpty()) {
-                            recipe.append("                    return elem.withTemplate(" + after + ", getCursor(), elem.getCoordinates().replace());\n");
+                            recipe.append("                    return " + after + ".apply(getCursor(), elem.getCoordinates().replace());\n");
                         } else {
-                            recipe.append("                    return elem.withTemplate(" + after + ", getCursor(), elem.getCoordinates().replace(), " + parameters + ");\n");
+                            recipe.append("                    return " + after + ".apply(getCursor(), elem.getCoordinates().replace(), " + parameters + ");\n");
                         }
                         recipe.append("                }\n");
                         recipe.append("                return super.visit" + methodSuffix + "(elem, ctx);\n");