Enable Lombok by default on Java 11+ (#4989)

* Enable Lombok by default Using local edge release jar * Remove feature flag from LombokTest * Restore Lombok feature flag for Java 8 for now * Add toml to IDE.properties.tmp * Restore feature flags in LombokTest for Java 8
openrewrite · Feb 5, 2025 · 422c053 · 422c053
1 parent 5541466
commit 422c053
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/IDE.properties.tmp b/IDE.properties.tmp
@@ -33,6 +33,7 @@ rewrite-json
 rewrite-maven
 rewrite-properties
 rewrite-protobuf
+rewrite-toml
 rewrite-xml
 rewrite-yaml
 

diff --git a/...ite-gradle/src/test/java/org/openrewrite/maven/tree/OpenRewriteModelSerializableTest.java b/...ite-gradle/src/test/java/org/openrewrite/maven/tree/OpenRewriteModelSerializableTest.java
@@ -23,7 +23,7 @@
 import java.io.Serializable;
 
 /**
- * Every model object that is transferred via the tooling API must implement {@link Serializable}, including
+ * Every model object that is transferred via the tooling API must implement {@link java.io.Serializable}, including
  * certain maven model objects that are shared by rewrite-gradle.
  */
 class OpenRewriteModelSerializableTest {

diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11Parser.java b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11Parser.java
@@ -124,8 +124,7 @@ private ReloadableJava11Parser(
         Options.instance(context).put("should-stop.ifError", "GENERATE");
 
         LOMBOK:
-        if (System.getenv().getOrDefault("REWRITE_LOMBOK", System.getProperty("rewrite.lombok")) != null &&
-                classpath != null && classpath.stream().anyMatch(it -> it.toString().contains("lombok"))) {
+        if (classpath != null && classpath.stream().anyMatch(it -> it.toString().contains("lombok"))) {
             Processor lombokProcessor = null;
             try {
                 // https://projectlombok.org/contributing/lombok-execution-path

diff --git a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17Parser.java b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17Parser.java
@@ -122,8 +122,7 @@ private ReloadableJava17Parser(
         Options.instance(context).put("should-stop.ifError", "GENERATE");
 
         LOMBOK:
-        if (System.getenv().getOrDefault("REWRITE_LOMBOK", System.getProperty("rewrite.lombok")) != null &&
-            classpath != null && classpath.stream().anyMatch(it -> it.toString().contains("lombok"))) {
+        if (classpath != null && classpath.stream().anyMatch(it -> it.toString().contains("lombok"))) {
             Processor lombokProcessor = null;
             try {
                 // https://projectlombok.org/contributing/lombok-execution-path

diff --git a/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21Parser.java b/rewrite-java-21/src/main/java/org/openrewrite/java/isolated/ReloadableJava21Parser.java
@@ -122,8 +122,7 @@ private ReloadableJava21Parser(
         Options.instance(context).put("should-stop.ifError", "GENERATE");
 
         LOMBOK:
-        if (System.getenv().getOrDefault("REWRITE_LOMBOK", System.getProperty("rewrite.lombok")) != null &&
-            classpath != null && classpath.stream().anyMatch(it -> it.toString().contains("lombok"))) {
+        if (classpath != null && classpath.stream().anyMatch(it -> it.toString().contains("lombok"))) {
             Processor lombokProcessor = null;
             try {
                 // https://projectlombok.org/contributing/lombok-execution-path

diff --git a/rewrite-java-lombok/build.gradle.kts b/rewrite-java-lombok/build.gradle.kts
@@ -57,7 +57,8 @@ dependencies {
     runtimeOnly("org.projectlombok:lombok:latest.release")
 
     // Add lombok dependency to the newly created lombok configuration
-    lombok("org.projectlombok:lombok:latest.release")
+    //lombok("org.projectlombok:lombok:latest.release")
+    lombok(files("libs/lombok-1.18.37.jar")) // Temporary pending the next stable release of lombok
     compileOnly(files(tools))
     compileOnly(files(unpackedAndRenamedLombokDir))
 }

diff --git a/rewrite-java-lombok/libs/lombok-1.18.37.jar b/rewrite-java-lombok/libs/lombok-1.18.37.jar
diff --git a/rewrite-java-tck/src/main/java/org/openrewrite/java/tree/LombokTest.java b/rewrite-java-tck/src/main/java/org/openrewrite/java/tree/LombokTest.java
@@ -38,6 +38,7 @@ class LombokTest implements RewriteTest {
 
     @BeforeAll
     static void setUp() {
+        // Only needed for Java 8, until enabled by default there
         System.setProperty("rewrite.lombok", "true");
     }