Refactorings

- Extracted method
- extracted variable decl

Author: fabapp2

components/sbm-core/src/main/java/org/springframework/sbm/java/refactoring/JavaGlobalRefactoringImpl.java

@@ -85,7 +85,8 @@ public List<RewriteSourceFileHolder<J.CompilationUnit>> find(Recipe recipe) {
 
     @NotNull
     protected List<RewriteSourceFileHolder<J.CompilationUnit>> findInternal(List<RewriteSourceFileHolder<J.CompilationUnit>> resourceWrappers, Recipe recipe) {
-        List<Result> results = executeRecipe(getAllCompilationUnits().stream().map(RewriteSourceFileHolder::getSourceFile).collect(Collectors.toList()), recipe);
+        List<J.CompilationUnit> compilationUnits = resourceWrappers.stream().map(RewriteSourceFileHolder::getSourceFile).collect(Collectors.toList());
+        List<Result> results = executeRecipe(compilationUnits, recipe);
         return results.stream()
                 .map(r -> r.getAfter())
                 .filter(r -> J.CompilationUnit.class.isAssignableFrom(r.getClass()))

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/filter/SpringDataJpaAnalyzer.java

@@ -34,29 +34,21 @@ public List<MatchingMethod> getJpaRepositoriesWithGetByIdMethod(ProjectContext c
         List<JavaSourceAndType> jpaRepositories = context.getProjectJavaSources().findTypesImplementing(jpaRepositoryInterface);
         // FIXME: type of PK must be retrieved, moves to rewrite when these migrations are provided as OpenRewrite recipes
         String methodPattern = "getById(java.lang.Long)";
-        return jpaRepositories.stream()
-                .filter(jat -> jat.getType().hasMethod(methodPattern))
-                .map(jat -> {
-                    return new MatchingMethod(jat, methodPattern, jat.getType().getMethod(methodPattern));
-                })
-                .collect(Collectors.toList());
-        //return findRepositoriesDeclaring(jpaRepositories, methodPattern);
+        return findRepositoriesDeclaring(jpaRepositories, methodPattern);
     }
 
     private List<MatchingMethod> findRepositoriesDeclaring(List<JavaSourceAndType> jpaRepositories, String methodPattern) {
         return jpaRepositories.stream()
                 .filter(jat -> jat.getType().hasMethod(methodPattern))
-                .map(jat -> {
-                    return new MatchingMethod(jat, methodPattern, jat.getType().getMethod(methodPattern));
-                })
+                .map(jat -> new MatchingMethod(jat, methodPattern, jat.getType().getMethod(methodPattern)))
                 .collect(Collectors.toList());
     }
 
     @Value
-    public class MatchingMethod {
-        private final JavaSourceAndType jat;
-        private final String methodPattern;
-        private final Method method;
+    public static class MatchingMethod {
+        JavaSourceAndType jat;
+        String methodPattern;
+        Method method;
 
         public MatchingMethod(JavaSourceAndType jat, String methodPattern, Method method) {
             this.jat = jat;