Allow loading recipes from inner classes

openrewrite · Oct 2, 2023 · 164d356 · 164d356
1 parent e900928
commit 164d356
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/rewrite-core/src/main/java/org/openrewrite/config/ClasspathScanningLoader.java b/rewrite-core/src/main/java/org/openrewrite/config/ClasspathScanningLoader.java
@@ -72,13 +72,13 @@ public ClasspathScanningLoader(Properties properties, String[] acceptPackages) {
      */
     public ClasspathScanningLoader(Properties properties, ClassLoader classLoader) {
         scanClasses(new ClassGraph()
-                 .ignoreParentClassLoaders()
-                 .overrideClassLoaders(classLoader), classLoader);
+                .ignoreParentClassLoaders()
+                .overrideClassLoaders(classLoader), classLoader);
 
         scanYaml(new ClassGraph()
-                 .ignoreParentClassLoaders()
-                 .overrideClassLoaders(classLoader)
-                 .acceptPaths("META-INF/rewrite"),
+                        .ignoreParentClassLoaders()
+                        .overrideClassLoaders(classLoader)
+                        .acceptPaths("META-INF/rewrite"),
                 properties,
                 emptyList(),
                 classLoader);
@@ -163,10 +163,9 @@ private void scanClasses(ClassGraph classGraph, ClassLoader classLoader) {
     private void configureRecipes(ScanResult result, String className) {
         for (ClassInfo classInfo : result.getSubclasses(className)) {
             Class<?> recipeClass = classInfo.loadClass();
-            if (recipeClass.getName().equals(DeclarativeRecipe.class.getName())
-                || recipeClass.getEnclosingClass() != null
+            if (recipeClass.getName().equals(DeclarativeRecipe.class.getName()) ||
                 // `ScanningRecipe` is an example of an abstract `Recipe` subtype
-                || (recipeClass.getModifiers() & Modifier.ABSTRACT) != 0) {
+                (recipeClass.getModifiers() & Modifier.ABSTRACT) != 0) {
                 continue;
             }
             Timer.Builder builder = Timer.builder("rewrite.scan.configure.recipe");