Merge remote-tracking branch 'upstream/main'

Author: barbulescu

.claude/settings.json

@@ -1,6 +1,10 @@
 {
   "permissions": {
     "allow": [
+      "Bash(npm view:*)",
+      "Bash(npx:*)",
+      "Bash(npm ls:*)",
+      "Bash(npm install:*)",
       "Bash(../gradlew dependencies:*)",
       "Bash(./gradlew:*)",
       "Bash(cat:*)",

.github/workflows/dependency-submission.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v5
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21

.gitignore

@@ -15,3 +15,4 @@ IDE.properties
 .tool-versions
 .aider*
 /worktrees
+rewrite-gradle-tooling-model/model/src/main/resources/test-manifest.txt

.run/JS RPC server (socket).run.xml

@@ -0,0 +1,5 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="node rewrite-rpc" type="ChromiumRemoteDebugType" factoryName="Chromium Remote" port="9229">
+    <method v="2" />
+  </configuration>
+</component>

.run/node rewrite-rpc.run.xml

@@ -11,7 +11,7 @@ dependencies {
     jmh(project(":rewrite-core"))
     jmh(project(":rewrite-java-21"))
     jmh(project(":rewrite-maven"))
-    jmh("org.rocksdb:rocksdbjni:latest.release")
+    jmh("org.rocksdb:rocksdbjni:10.2.1")
     jmh("org.openjdk.jmh:jmh-core:latest.release")
     jmh("org.openjdk.jol:jol-core:latest.release")
     jmh("io.github.fastfilter:fastfilter:latest.release")

rewrite-benchmarks/build.gradle.kts

@@ -45,7 +45,6 @@ public class ClasspathScanningLoader implements ResourceLoader {
     private final LinkedHashSet<RecipeDescriptor> recipeDescriptors = new LinkedHashSet<>();
     private final List<CategoryDescriptor> categoryDescriptors = new ArrayList<>();
 
-    private final Map<String, List<Contributor>> recipeAttributions = new HashMap<>();
     private final Map<String, List<RecipeExample>> recipeExamples = new HashMap<>();
 
     private final ClassLoader classLoader;
@@ -145,11 +144,10 @@ private void scanYaml(ClassGraph classGraph, Properties properties, Collection<?
                 }
                 categoryDescriptors.addAll(resourceLoader.listCategoryDescriptors());
                 styles.addAll(resourceLoader.listStyles());
-                recipeAttributions.putAll(resourceLoader.listContributors());
                 recipeExamples.putAll(resourceLoader.listRecipeExamples());
             }
             for (YamlResourceLoader resourceLoader : yamlResourceLoaders) {
-                recipeDescriptors.addAll(resourceLoader.listRecipeDescriptors(recipes.values(), recipeAttributions, recipeExamples));
+                recipeDescriptors.addAll(resourceLoader.listRecipeDescriptors(recipes.values(), recipeExamples));
             }
         }
     }
@@ -255,7 +253,6 @@ public Map<String, List<RecipeExample>> listRecipeExamples() {
 
     @Override
     public Map<String, List<Contributor>> listContributors() {
-        ensureScanned();
-        return recipeAttributions;
+        return emptyMap();
     }
 }

rewrite-core/src/main/java/org/openrewrite/config/ClasspathScanningLoader.java

@@ -16,6 +16,7 @@
 package org.openrewrite.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.google.errorprone.annotations.InlineMe;
 import lombok.*;
 import lombok.experimental.NonFinal;
 import org.intellij.lang.annotations.Language;
@@ -90,19 +91,31 @@ public Duration getEstimatedEffortPerOccurrence() {
                 estimatedEffortPerOccurrence;
     }
 
-    public void initialize(Collection<Recipe> availableRecipes, Map<String, List<Contributor>> recipeToContributors) {
+    public void initialize(Collection<Recipe> availableRecipes) {
         Map<String, Recipe> recipeMap = new HashMap<>();
         availableRecipes.forEach(r -> recipeMap.putIfAbsent(r.getName(), r));
-        initialize(uninitializedRecipes, recipeList, recipeMap::get, recipeToContributors);
-        initialize(uninitializedPreconditions, preconditions, recipeMap::get, recipeToContributors);
+        initialize(uninitializedRecipes, recipeList, recipeMap::get);
+        initialize(uninitializedPreconditions, preconditions, recipeMap::get);
+    }
+
+    @Deprecated
+    @InlineMe(replacement = "this.initialize(availableRecipes)")
+    public void initialize(Collection<Recipe> availableRecipes, Map<String, List<Contributor>> recipeToContributors) {
+        this.initialize(availableRecipes);
     }
 
+    public void initialize(Function<String, @Nullable Recipe> availableRecipes) {
+        initialize(uninitializedRecipes, recipeList, availableRecipes);
+        initialize(uninitializedPreconditions, preconditions, availableRecipes);
+    }
+
+    @Deprecated
+    @InlineMe(replacement = "this.initialize(availableRecipes)")
     public void initialize(Function<String, @Nullable Recipe> availableRecipes, Map<String, List<Contributor>> recipeToContributors) {
-        initialize(uninitializedRecipes, recipeList, availableRecipes, recipeToContributors);
-        initialize(uninitializedPreconditions, preconditions, availableRecipes, recipeToContributors);
+        this.initialize(availableRecipes);
     }
 
-    private void initialize(List<Recipe> uninitialized, List<Recipe> initialized, Function<String, @Nullable Recipe> availableRecipes, Map<String, List<Contributor>> recipeToContributors) {
+    private void initialize(List<Recipe> uninitialized, List<Recipe> initialized, Function<String, @Nullable Recipe> availableRecipes) {
         initialized.clear();
         for (int i = 0; i < uninitialized.size(); i++) {
             Recipe recipe = uninitialized.get(i);
@@ -111,21 +124,20 @@ private void initialize(List<Recipe> uninitialized, List<Recipe> initialized, Fu
                 Recipe subRecipe = availableRecipes.apply(recipeFqn);
                 if (subRecipe != null) {
                     if (subRecipe instanceof DeclarativeRecipe) {
-                        ((DeclarativeRecipe) subRecipe).initialize(availableRecipes, recipeToContributors);
+                        ((DeclarativeRecipe) subRecipe).initialize(availableRecipes);
                     }
                     initialized.add(subRecipe);
                 } else {
                     initValidation = initValidation.and(
                             invalid(name + ".recipeList" +
-                                    "[" + i + "] (in " + source + ")",
+                                            "[" + i + "] (in " + source + ")",
                                     recipeFqn,
                                     "recipe '" + recipeFqn + "' does not exist.",
                                     null));
                 }
             } else {
-                recipe.setContributors(recipeToContributors.getOrDefault(recipe.getName(), emptyList()));
                 if (recipe instanceof DeclarativeRecipe) {
-                    ((DeclarativeRecipe) recipe).initialize(availableRecipes, recipeToContributors);
+                    ((DeclarativeRecipe) recipe).initialize(availableRecipes);
                 }
                 initialized.add(recipe);
             }
@@ -184,7 +196,7 @@ public String getDisplayName() {
         @Override
         public String getDescription() {
             return "Evaluates a precondition and makes that result available to the preconditions of other recipes. " +
-                   "\"bellwether\", noun - One that serves as a leader or as a leading indicator of future trends.";
+                    "\"bellwether\", noun - One that serves as a leader or as a leading indicator of future trends.";
         }
 
         Supplier<TreeVisitor<?, ExecutionContext>> precondition;
@@ -323,7 +335,7 @@ public final List<Recipe> getRecipeList() {
 
     private TreeVisitor<?, ExecutionContext> orVisitors(Recipe recipe) {
         List<TreeVisitor<?, ExecutionContext>> conditions = new ArrayList<>();
-        if(recipe instanceof ScanningRecipe) {
+        if (recipe instanceof ScanningRecipe) {
             //noinspection rawtypes
             ScanningRecipe scanning = (ScanningRecipe) recipe;
             //noinspection unchecked
@@ -357,7 +369,7 @@ private static boolean isScanningRequired(Recipe recipe) {
         if (recipe instanceof ScanningRecipe) {
             // DeclarativeRecipe is technically a ScanningRecipe, but it only needs the
             // scanning phase if it or one of its sub-recipes or preconditions is a ScanningRecipe
-            if(recipe instanceof DeclarativeRecipe) {
+            if (recipe instanceof DeclarativeRecipe) {
                 for (Recipe precondition : ((DeclarativeRecipe) recipe).getPreconditions()) {
                     if (isScanningRequired(precondition)) {
                         return true;
@@ -438,30 +450,9 @@ protected RecipeDescriptor createRecipeDescriptor() {
                 getExamples(), source);
     }
 
-    @Value
-    private static class NameEmail {
-        String name;
-        String email;
-    }
-
     @Override
     public List<Contributor> getContributors() {
-        if (contributors == null) {
-            Map<NameEmail, Integer> contributorToLineCount = new HashMap<>();
-            List<Contributor> combined = new ArrayList<>();
-            for (Recipe recipe : getRecipeList()) {
-                for (Contributor contributor : recipe.getContributors()) {
-                    NameEmail nameEmail = new NameEmail(contributor.getName(), contributor.getEmail());
-                    contributorToLineCount.put(nameEmail, contributorToLineCount.getOrDefault(nameEmail, 0) + contributor.getLineCount());
-                }
-            }
-            for (Map.Entry<NameEmail, Integer> contributorEntry : contributorToLineCount.entrySet()) {
-                combined.add(new Contributor(contributorEntry.getKey().getName(), contributorEntry.getKey().getEmail(), contributorEntry.getValue()));
-            }
-            combined.sort(Comparator.comparing(Contributor::getLineCount).reversed());
-            contributors = combined;
-        }
-        return contributors;
+        return emptyList();
     }
 
     @Override

rewrite-core/src/main/java/org/openrewrite/config/DeclarativeRecipe.java

@@ -17,7 +17,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.jspecify.annotations.Nullable;
-import org.openrewrite.Contributor;
 import org.openrewrite.Recipe;
 import org.openrewrite.RecipeException;
 import org.openrewrite.style.NamedStyles;
@@ -35,7 +34,6 @@
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
-import static org.openrewrite.config.ResourceLoader.RecipeDetail.CONTRIBUTORS;
 import static org.openrewrite.config.ResourceLoader.RecipeDetail.EXAMPLES;
 
 public class Environment {
@@ -50,12 +48,10 @@ public List<Recipe> listRecipes() {
         Map<String, Recipe> dependencyRecipeMap = new HashMap<>();
         dependencyRecipes.forEach(r -> dependencyRecipeMap.putIfAbsent(r.getName(), r));
 
-        Map<String, List<Contributor>> recipeToContributors = new HashMap<>();
         Map<String, List<RecipeExample>> recipeExamples = new HashMap<>();
         for (ResourceLoader r : resourceLoaders) {
             if (r instanceof YamlResourceLoader) {
                 recipeExamples.putAll(r.listRecipeExamples());
-                recipeToContributors.putAll(r.listContributors());
             }
         }
 
@@ -65,22 +61,20 @@ public List<Recipe> listRecipes() {
         }
         for (Recipe recipe : dependencyRecipes) {
             if (recipe instanceof DeclarativeRecipe) {
-                ((DeclarativeRecipe) recipe).initialize(dependencyRecipeMap::get, recipeToContributors);
+                ((DeclarativeRecipe) recipe).initialize(dependencyRecipeMap::get);
             }
         }
 
         Map<String, Recipe> availableRecipeMap = new HashMap<>(dependencyRecipeMap);
         recipes.forEach(r -> availableRecipeMap.putIfAbsent(r.getName(), r));
 
         for (Recipe recipe : recipes) {
-            recipe.setContributors(recipeToContributors.get(recipe.getName()));
-
             if (recipeExamples.containsKey(recipe.getName())) {
                 recipe.setExamples(recipeExamples.get(recipe.getName()));
             }
 
             if (recipe instanceof DeclarativeRecipe) {
-                ((DeclarativeRecipe) recipe).initialize(availableRecipeMap::get, recipeToContributors);
+                ((DeclarativeRecipe) recipe).initialize(availableRecipeMap::get);
             }
         }
         return recipes;
@@ -93,24 +87,12 @@ public Collection<CategoryDescriptor> listCategoryDescriptors() {
     }
 
     public Collection<RecipeDescriptor> listRecipeDescriptors() {
-        Map<String, List<Contributor>> recipeToContributors = new HashMap<>();
         Map<String, List<RecipeExample>> recipeToExamples = new HashMap<>();
         for (ResourceLoader r : resourceLoaders) {
             if (r instanceof YamlResourceLoader) {
-                recipeToContributors.putAll(r.listContributors());
                 recipeToExamples.putAll(r.listRecipeExamples());
             } else if (r instanceof ClasspathScanningLoader) {
                 ClasspathScanningLoader classpathScanningLoader = (ClasspathScanningLoader) r;
-
-                Map<String, List<Contributor>> contributors = classpathScanningLoader.listContributors();
-                for (String key : contributors.keySet()) {
-                    if (recipeToContributors.containsKey(key)) {
-                        recipeToContributors.get(key).addAll(contributors.get(key));
-                    } else {
-                        recipeToContributors.put(key, contributors.get(key));
-                    }
-                }
-
                 Map<String, List<RecipeExample>> examplesMap = classpathScanningLoader.listRecipeExamples();
                 for (String key : examplesMap.keySet()) {
                     if (recipeToExamples.containsKey(key)) {
@@ -125,17 +107,11 @@ public Collection<RecipeDescriptor> listRecipeDescriptors() {
         List<RecipeDescriptor> result = new ArrayList<>();
         for (ResourceLoader r : resourceLoaders) {
             if (r instanceof YamlResourceLoader) {
-                result.addAll((((YamlResourceLoader) r).listRecipeDescriptors(emptyList(), recipeToContributors, recipeToExamples)));
+                result.addAll((((YamlResourceLoader) r).listRecipeDescriptors(emptyList(), recipeToExamples)));
             } else {
                 Collection<RecipeDescriptor> descriptors = r.listRecipeDescriptors();
                 for (RecipeDescriptor descriptor : descriptors) {
-                    if (descriptor.getContributors() != null &&
-                        recipeToContributors.containsKey(descriptor.getName())) {
-                        descriptor.getContributors().addAll(recipeToContributors.get(descriptor.getName()));
-                    }
-
-                    if (descriptor.getExamples() != null &&
-                        recipeToExamples.containsKey(descriptor.getName())) {
+                    if (recipeToExamples.containsKey(descriptor.getName())) {
                         descriptor.getExamples().addAll(recipeToExamples.get(descriptor.getName()));
                     }
                 }
@@ -159,7 +135,7 @@ public Recipe activateRecipes(Collection<String> activeRecipes) {
         if (activeRecipes.isEmpty()) {
             recipes = emptyList();
         } else if (activeRecipes.size() == 1) {
-            Recipe recipe = loadRecipe(activeRecipes.iterator().next(), CONTRIBUTORS, EXAMPLES);
+            Recipe recipe = loadRecipe(activeRecipes.iterator().next(), EXAMPLES);
             if (recipe != null) {
                 return recipe;
             }
@@ -217,19 +193,12 @@ public Recipe activateRecipes(String... activeRecipes) {
         }
 
         boolean includeExamples = ResourceLoader.RecipeDetail.EXAMPLES.includedIn(details);
-        boolean includeContributors = ResourceLoader.RecipeDetail.CONTRIBUTORS.includedIn(details);
 
-        Map<String, List<Contributor>> recipeToContributors = new HashMap<>();
         Map<String, List<RecipeExample>> recipeExamples = new HashMap<>();
-        if (includeContributors || includeExamples) {
+        if (includeExamples) {
             for (ResourceLoader r : resourceLoaders) {
                 if (r instanceof YamlResourceLoader) {
-                    if (includeExamples) {
-                        recipeExamples.putAll(r.listRecipeExamples());
-                    }
-                    if (includeContributors) {
-                        recipeToContributors.putAll(r.listContributors());
-                    }
+                    recipeExamples.putAll(r.listRecipeExamples());
                 }
             }
         }
@@ -242,14 +211,10 @@ public Recipe activateRecipes(String... activeRecipes) {
         }
         for (Recipe dependency : dependencyRecipes.values()) {
             if (dependency instanceof DeclarativeRecipe) {
-                ((DeclarativeRecipe) dependency).initialize(dependencyRecipes::get, recipeToContributors);
+                ((DeclarativeRecipe) dependency).initialize(dependencyRecipes::get);
             }
         }
 
-        if (includeContributors && recipeToContributors.containsKey(recipe.getName())) {
-            recipe.setContributors(recipeToContributors.get(recipe.getName()));
-        }
-
         if (includeExamples && recipeExamples.containsKey(recipe.getName())) {
             recipe.setExamples(recipeExamples.get(recipe.getName()));
         }
@@ -267,7 +232,7 @@ public Recipe activateRecipes(String... activeRecipes) {
                 }
                 return null;
             };
-            ((DeclarativeRecipe) recipe).initialize(loadFunction, recipeToContributors);
+            ((DeclarativeRecipe) recipe).initialize(loadFunction);
         }
         return recipe;
     }

rewrite-core/src/main/java/org/openrewrite/config/Environment.java

@@ -59,6 +59,7 @@ public class RecipeDescriptor {
 
     List<Maintainer> maintainers;
 
+    @Deprecated(/* No longer populated */)
     List<Contributor> contributors;
 
     List<RecipeExample> examples;