From 52f5318308c1d71c44ab7c7432904339d3b009b6 Mon Sep 17 00:00:00 2001
From: Laurens Westerlaken <laurens.westerlaken@jdriven.com>
Date: Thu, 12 Sep 2024 14:51:50 +0200
Subject: [PATCH] When upgrading mockito also upgrade potential byte buddy
 dependencies (#600)

* Upgrade byte buddy dependency

* Apply glob

* Inline variables and adopt `getFirst()`

---------

Co-authored-by: Tim te Beek <tim@moderne.io>
---
 .../resources/META-INF/rewrite/mockito.yml    |  16 ++-
 .../mockito/MockitoInlineToCoreTest.java      | 127 ++++++++++++------
 2 files changed, 103 insertions(+), 40 deletions(-)

diff --git a/src/main/resources/META-INF/rewrite/mockito.yml b/src/main/resources/META-INF/rewrite/mockito.yml
index 18d8382b4..49a5b193a 100644
--- a/src/main/resources/META-INF/rewrite/mockito.yml
+++ b/src/main/resources/META-INF/rewrite/mockito.yml
@@ -43,6 +43,10 @@ recipeList:
       groupId: org.mockito
       artifactId: "*"
       newVersion: 5.x
+  - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
+      groupId: net.bytebuddy
+      artifactId: byte-buddy*
+      newVersion: 1.15.x
   - org.openrewrite.maven.RemoveDuplicateDependencies
 
 ---
@@ -59,6 +63,10 @@ recipeList:
       groupId: org.mockito
       artifactId: "*"
       newVersion: 4.x
+  - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
+      groupId: net.bytebuddy
+      artifactId: byte-buddy*
+      newVersion: 1.12.19
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.testing.mockito.Mockito1to3Migration
@@ -143,8 +151,8 @@ recipeList:
   - org.openrewrite.java.testing.mockito.CleanupMockitoImports
   - org.openrewrite.java.testing.mockito.MockUtilsToStatic
   - org.openrewrite.java.testing.junit5.MockitoJUnitToMockitoExtension
-# https://github.com/openrewrite/rewrite-testing-frameworks/issues/360
-#  - org.openrewrite.java.testing.mockito.ReplacePowerMockito
+  # https://github.com/openrewrite/rewrite-testing-frameworks/issues/360
+  #  - org.openrewrite.java.testing.mockito.ReplacePowerMockito
   - org.openrewrite.java.testing.mockito.RetainStrictnessWarn
   - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.mockito
@@ -160,3 +168,7 @@ recipeList:
       oldGroupId: org.mockito
       oldArtifactId: mockito-all
       newArtifactId: mockito-core
+  - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
+      groupId: net.bytebuddy
+      artifactId: byte-buddy*
+      newVersion: 1.11.13
diff --git a/src/test/java/org/openrewrite/java/testing/mockito/MockitoInlineToCoreTest.java b/src/test/java/org/openrewrite/java/testing/mockito/MockitoInlineToCoreTest.java
index a7bdb1998..7e68ccb00 100644
--- a/src/test/java/org/openrewrite/java/testing/mockito/MockitoInlineToCoreTest.java
+++ b/src/test/java/org/openrewrite/java/testing/mockito/MockitoInlineToCoreTest.java
@@ -16,6 +16,7 @@
 package org.openrewrite.java.testing.mockito;
 
 import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
 
@@ -29,6 +30,7 @@ public void defaults(RecipeSpec spec) {
         spec.recipeFromResources("org.openrewrite.java.testing.mockito.Mockito1to5Migration");
     }
 
+    @DocumentExample
     @Test
     void inlineToCore() {
         rewriteRun(
@@ -50,25 +52,22 @@ void inlineToCore() {
                 </dependencies>
               </project>
               """,
-            sourceSpecs -> sourceSpecs.after(after -> {
-                String version = Pattern.compile("<version>(5.+)</version>").matcher(after).results().reduce((a, b) -> b).orElseThrow().group(1);
-                return """
-                  <project>
-                    <modelVersion>4.0.0</modelVersion>
-                    <groupId>com.example</groupId>
-                    <artifactId>demo</artifactId>
-                    <version>0.0.1-SNAPSHOT</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.mockito</groupId>
-                            <artifactId>mockito-core</artifactId>
-                            <version>%s</version>
-                            <scope>test</scope>
-                        </dependency>
-                    </dependencies>
-                  </project>
-                  """.formatted(version);
-            })
+            spec -> spec.after(after -> """
+              <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.example</groupId>
+                <artifactId>demo</artifactId>
+                <version>0.0.1-SNAPSHOT</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                        <version>%s</version>
+                        <scope>test</scope>
+                    </dependency>
+                </dependencies>
+              </project>
+              """.formatted(Pattern.compile("<version>(5.+)</version>").matcher(after).results().findFirst().orElseThrow().group(1)))
           )
         );
     }
@@ -100,25 +99,77 @@ void noDuplicates() {
                 </dependencies>
               </project>
               """,
-            sourceSpecs -> sourceSpecs.after(after -> {
-                String version = Pattern.compile("<version>(5.+)</version>").matcher(after).results().reduce((a, b) -> b).orElseThrow().group(1);
-                return """
-                  <project>
-                    <modelVersion>4.0.0</modelVersion>
-                    <groupId>com.example</groupId>
-                    <artifactId>demo</artifactId>
-                    <version>0.0.1-SNAPSHOT</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.mockito</groupId>
-                            <artifactId>mockito-core</artifactId>
-                            <version>%s</version>
-                            <scope>test</scope>
-                        </dependency>
-                    </dependencies>
-                  </project>
-                  """.formatted(version);
-            })
+            spec -> spec.after(after -> """
+              <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.example</groupId>
+                <artifactId>demo</artifactId>
+                <version>0.0.1-SNAPSHOT</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                        <version>%s</version>
+                        <scope>test</scope>
+                    </dependency>
+                </dependencies>
+              </project>
+              """.formatted(Pattern.compile("<version>(5.+)</version>").matcher(after).results().findFirst().orElseThrow().group(1)))
+          )
+        );
+    }
+
+    @Test
+    void shouldUpdateByteBuddy() {
+        rewriteRun(
+          //language=xml
+          pomXml(
+            """
+              <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.example</groupId>
+                <artifactId>demo</artifactId>
+                <version>0.0.1-SNAPSHOT</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                        <version>5.13.0</version>
+                        <scope>test</scope>
+                    </dependency>
+                    <dependency>
+                        <groupId>net.bytebuddy</groupId>
+                        <artifactId>byte-buddy</artifactId>
+                        <version>1.12.19</version>
+                        <scope>test</scope>
+                    </dependency>
+                </dependencies>
+              </project>
+              """,
+            spec -> spec.after(after -> """
+              <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.example</groupId>
+                <artifactId>demo</artifactId>
+                <version>0.0.1-SNAPSHOT</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-core</artifactId>
+                        <version>%s</version>
+                        <scope>test</scope>
+                    </dependency>
+                    <dependency>
+                        <groupId>net.bytebuddy</groupId>
+                        <artifactId>byte-buddy</artifactId>
+                        <version>%s</version>
+                        <scope>test</scope>
+                    </dependency>
+                </dependencies>
+              </project>
+              """.formatted(
+              Pattern.compile("<version>(5.+)</version>").matcher(after).results().findFirst().orElseThrow().group(1),
+              Pattern.compile("<version>(1.15.+)</version>").matcher(after).results().findFirst().orElseThrow().group(1)))
           )
         );
     }