Only remove gradleEnterprise and develocity.buildCache (#6476)

* Only remove `gradleEnterprise` and `develocity.buildCache`

* Polish

---------

Co-authored-by: Shannon Pamperl <shannon@moderne.io>

Author: timtebeek

rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/RemoveDevelocityConfiguration.java

@@ -62,18 +62,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                             J.Lambda lambda = (J.Lambda) m.getArguments().get(0);
                             J.Block body = (J.Block) lambda.getBody();
 
-                            List<Statement> filteredStatements = ListUtils.filter(body.getStatements(),
-                                    stmt -> {
-                                        if (stmt instanceof J.Return && ((J.Return) stmt).getExpression() instanceof J.MethodInvocation) {
-                                            // Unpack J.Return wrapping last statement in closure
-                                            stmt = (J.MethodInvocation) ((J.Return) stmt).getExpression();
-                                        }
-                                        if (!(stmt instanceof J.MethodInvocation)) {
-                                            return true;
-                                        }
-                                        // Remove only 'remote' method invocations
-                                        return !"remote".equals(((J.MethodInvocation) stmt).getSimpleName());
-                                    });
+                            List<Statement> filteredStatements = ListUtils.filter(body.getStatements(), this::retainStatement);
                             if (filteredStatements.isEmpty()) {
                                 return null;
                             }
@@ -82,6 +71,29 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
 
                         return m;
                     }
+
+                    private boolean retainStatement(Statement stmt) {
+                        if (stmt instanceof J.Return && ((J.Return) stmt).getExpression() instanceof J.MethodInvocation) {
+                            // Unpack J.Return wrapping last statement in closure
+                            stmt = (J.MethodInvocation) ((J.Return) stmt).getExpression();
+                        }
+                        if (!(stmt instanceof J.MethodInvocation)) {
+                            return true;
+                        }
+                        J.MethodInvocation remote = (J.MethodInvocation) stmt;
+                        if (!"remote".equals(remote.getSimpleName())) {
+                            return true;
+                        }
+                        if (remote.getArguments().isEmpty() || !(remote.getArguments().get(0) instanceof J.FieldAccess)) {
+                            return true;
+                        }
+                        J.FieldAccess fieldAccess = (J.FieldAccess) remote.getArguments().get(0);
+                        if (!(fieldAccess.getTarget() instanceof J.Identifier)) {
+                            return true;
+                        }
+                        J.Identifier target = (J.Identifier) fieldAccess.getTarget();
+                        return !"develocity".equals(target.getSimpleName()) && !"gradleEnterprise".equals(target.getSimpleName());
+                    }
                 });
     }
 

rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveDevelocityTest.java

@@ -157,76 +157,6 @@ void removeEntireBuildCacheWhenOnlyRemoteExists() {
         );
     }
 
-    @Test
-    void removeHttpBuildCache() {
-        rewriteRun(
-          settingsGradle(
-            """
-              plugins {
-                  id 'com.gradle.develocity' version '3.17'
-              }
-              
-              develocity {
-                  server = 'https://ge.example.com'
-              }
-              
-              buildCache {
-                  remote(HttpBuildCache) {
-                      url = 'https://other-cache.com/cache/'
-                  }
-                  remote(develocity.buildCache) {
-                      enabled = true
-                  }
-              }
-              """,
-            ""
-          )
-        );
-    }
-
-    @Test
-    void removeAllRemoteConfigurations() {
-        rewriteRun(
-          settingsGradle(
-            """
-              plugins {
-                  id 'com.gradle.develocity' version '3.17'
-              }
-              
-              develocity {
-                  server = 'https://ge.example.com'
-                  buildScan {
-                      termsOfUseUrl = 'https://gradle.com/terms-of-service'
-                      termsOfUseAgree = 'yes'
-                  }
-              }
-              
-              buildCache {
-                  local {
-                      enabled = true
-                  }
-                  remote(HttpBuildCache) {
-                      url = 'https://cache.com'
-                  }
-                  remote(develocity.buildCache) {
-                      push = true
-                  }
-              }
-              """,
-            """
-              
-              
-              buildCache {
-                  local {
-                      enabled = true
-                  }
-              }
-              """,
-            SourceSpec::noTrim
-          )
-        );
-    }
-
     @Test
     void removeGradleEnterpriseConfiguration() {
         rewriteRun(
@@ -301,7 +231,16 @@ void removeEntireBuildCacheWithOnlyHttpBuildCache() {
                   }
               }
               """,
-            ""
+            """
+
+
+              buildCache {
+                  remote(HttpBuildCache) {
+                      url = 'https://cache.example.com'
+                  }
+              }
+              """,
+            SourceSpec::noTrim
           )
         );
     }