Merge branch 'main' into 4269_maven-activebydefault-profiles

openrewrite · Dec 17, 2024 · 7533efc · 7533efc
2 parents 1f36d4d + 372246c
commit 7533efc
Show file tree

Hide file tree

Showing 261 changed files with 16,548 additions and 3,905 deletions.
diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml
@@ -17,64 +17,3 @@ jobs:
     uses: openrewrite/gh-automation/.github/workflows/receive-pr.yml@main
     with:
       recipe: 'org.openrewrite.recipes.OpenRewriteBestPracticesSubset'
-      rewrite_yml: |
-        ---
-        type: specs.openrewrite.org/v1beta/recipe
-        name: org.openrewrite.recipes.OpenRewriteBestPracticesSubset
-        displayName: OpenRewrite best practices
-        description: Best practices for OpenRewrite recipe development.
-        recipeList:
-          - org.openrewrite.recipes.JavaRecipeBestPracticesSubset
-          - org.openrewrite.recipes.RecipeTestingBestPracticesSubset
-          - org.openrewrite.recipes.RecipeNullabilityBestPracticesSubset
-          #- org.openrewrite.java.OrderImports
-          - org.openrewrite.java.format.EmptyNewlineAtEndOfFile
-          - org.openrewrite.staticanalysis.InlineVariable
-          - org.openrewrite.staticanalysis.MissingOverrideAnnotation
-          - org.openrewrite.staticanalysis.UseDiamondOperator
-        ---
-        type: specs.openrewrite.org/v1beta/recipe
-        name: org.openrewrite.recipes.JavaRecipeBestPracticesSubset
-        displayName: Java Recipe best practices
-        description: Best practices for Java recipe development.
-        preconditions:
-          - org.openrewrite.java.search.FindTypes:
-              fullyQualifiedTypeName: org.openrewrite.Recipe
-              checkAssignability: true
-        recipeList:
-          - org.openrewrite.java.recipes.BlankLinesAroundFieldsWithAnnotations
-          - org.openrewrite.java.recipes.ExecutionContextParameterName
-          - org.openrewrite.java.recipes.MissingOptionExample
-          - org.openrewrite.java.recipes.RecipeEqualsAndHashCodeCallSuper
-          - org.openrewrite.java.recipes.UseTreeRandomId
-          - org.openrewrite.staticanalysis.NeedBraces
-          #- org.openrewrite.staticanalysis.RemoveSystemOutPrintln
-        ---
-        type: specs.openrewrite.org/v1beta/recipe
-        name: org.openrewrite.recipes.RecipeTestingBestPracticesSubset
-        displayName: Recipe testing best practices
-        description: Best practices for testing recipes.
-        preconditions:
-          - org.openrewrite.java.search.FindTypes:
-              fullyQualifiedTypeName: org.openrewrite.test.RewriteTest
-              checkAssignability: true
-        recipeList:
-          - org.openrewrite.java.recipes.RewriteTestClassesShouldNotBePublic
-          #- org.openrewrite.java.recipes.SelectRecipeExamples
-          - org.openrewrite.java.recipes.SourceSpecTextBlockIndentation
-          - org.openrewrite.java.testing.cleanup.RemoveTestPrefix
-          - org.openrewrite.java.testing.cleanup.TestsShouldNotBePublic
-          - org.openrewrite.staticanalysis.NeedBraces
-          - org.openrewrite.staticanalysis.RemoveSystemOutPrintln
-        ---
-        type: specs.openrewrite.org/v1beta/recipe
-        name: org.openrewrite.recipes.RecipeNullabilityBestPracticesSubset
-        displayName: Recipe nullability best practices
-        description: Use OpenRewrite internal nullability annotations; drop JetBrains annotations; use `package-info.java` instead.
-        recipeList:
-          - org.openrewrite.staticanalysis.NullableOnMethodReturnType
-          - org.openrewrite.java.RemoveAnnotation:
-              annotationPattern: '@org.jetbrains.annotations.NotNull'
-          - org.openrewrite.java.RemoveAnnotation:
-              annotationPattern: '@jakarta.annotation.Nonnull'
-          - org.openrewrite.java.jspecify.MigrateToJspecify
diff --git a/IDE.properties.tmp b/IDE.properties.tmp
@@ -18,6 +18,7 @@ rewrite-test
 # language parser.
 
 rewrite-java
+rewrite-java-lombok
 rewrite-java-test
 rewrite-java-tck
 rewrite-java-17

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
+distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
diff --git a/rewrite-benchmarks/src/jmh/java/org/openrewrite/benchmarks/java/JavaTypeCacheBenchmark.java b/rewrite-benchmarks/src/jmh/java/org/openrewrite/benchmarks/java/JavaTypeCacheBenchmark.java
@@ -22,8 +22,8 @@
 import org.openjdk.jmh.runner.RunnerException;
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
-import org.openrewrite.java.internal.JavaTypeCache;
 import org.openrewrite.java.internal.AdaptiveRadixJavaTypeCache;
+import org.openrewrite.java.internal.JavaTypeCache;
 
 import java.net.URISyntaxException;
 import java.util.Map;

diff --git a/rewrite-core/build.gradle.kts b/rewrite-core/build.gradle.kts
@@ -15,10 +15,6 @@ dependencies {
 
     api("org.jspecify:jspecify:latest.release")
 
-    // Pinning okhttp while waiting on 5.0.0
-    // https://github.com/openrewrite/rewrite/issues/1479
-    compileOnly("com.squareup.okhttp3:okhttp:4.9.3")
-
     implementation("org.apache.commons:commons-compress:latest.release")
 
     implementation("io.micrometer:micrometer-core:1.9.+")

diff --git a/rewrite-core/src/main/java/org/openrewrite/Cursor.java b/rewrite-core/src/main/java/org/openrewrite/Cursor.java
@@ -57,7 +57,7 @@ public Cursor getRoot() {
     /**
      * @return true if this cursor is the root of the tree, false otherwise
      */
-    final boolean isRoot() {
+    final public boolean isRoot() {
         return ROOT_VALUE.equals(value);
     }