Bump OpenRewrite to 3.14.0 (#6394)

* Bump OpenRewrite to 3.6.1

* Bump OpenRewrite to 3.14.0

* Remove redundant import add/remove

* Add v2 import in S3PojoToV2

* Update unit test for exceptions

Author: davidh44

test/v2-migration-tests/pom.xml

@@ -136,6 +136,11 @@
             <artifactId>test-utils</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/GradleProjectTest.java

@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIf;
-import software.amazon.awssdk.testutils.SdkVersionUtils;
 import software.amazon.awssdk.utils.Logger;
 
 public class GradleProjectTest {

test/v2-migration-tests/src/test/java/software/amazon/awssdk/v2migrationtests/MavenTestBase.java

@@ -51,7 +51,7 @@ protected static void verifyTransformation() throws IOException {
         String recipeCmd = "-Drewrite.activeRecipes=software.amazon.awssdk.v2migration.AwsSdkJavaV1ToV2";
         List<String> rewriteArgs = new ArrayList<>();
         // pin version since updates have broken tests
-        String rewriteMavenPluginVersion = "5.46.0";
+        String rewriteMavenPluginVersion = "6.17.0";
         addAll(rewriteArgs, "mvn", "org.openrewrite.maven:rewrite-maven-plugin:" + rewriteMavenPluginVersion + ":run",
                "-Drewrite.recipeArtifactCoordinates=software.amazon.awssdk:v2-migration:"+ getMigrationToolVersion() + "-PREVIEW",
                recipeCmd);

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/gradle/before/init.gradle

@@ -3,7 +3,7 @@ initscript {
         maven { url "https://plugins.gradle.org/m2" }
     }
     dependencies {
-        classpath("org.openrewrite:plugin:6.28.0")
+        classpath("org.openrewrite:plugin:7.15.0")
     }
 }
 

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven-nocompile/after/src/main/java/foo/bar/S3EnDateTime.java

@@ -25,7 +25,7 @@ public class S3EnDateTime {
     public void parseEvent(String jsonInput) {
         S3EventNotification notification = S3EventNotification.fromJson(jsonInput);
 
-        for (S3EventNotification.S3EventNotificationRecord record : notification.getRecords()) {
+        for (S3EventNotificationRecord record : notification.getRecords()) {
             DateTime eventTime = /*AWS SDK for Java v2 migration: getEventTime returns Instant instead of DateTime in v2. AWS SDK v2 does not include org.joda.time as a dependency. If you want to keep using DateTime, you'll need to manually add "org.joda.time:joda-time" dependency to your project after migration.*/new DateTime(record.getEventTime().toEpochMilli());
 
             GlacierEventData glacierEventData = record.getGlacierEventData();

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/Application.java

@@ -70,11 +70,11 @@ public static void main(String... args) {
 
         } catch (SqsException exception) {
             System.out.println(String.format("Error code: %s. RequestId: %s. Raw response content: %s",
-                                             exception.awsErrorDetails().errorCode(), exception.requestId(),
-                                             exception.awsErrorDetails().rawResponse().asUtf8String()));
+                exception.awsErrorDetails().errorCode(), exception.requestId(),
+                exception.awsErrorDetails().rawResponse().asUtf8String()));
         } catch (AwsServiceException exception) {
             System.out.println(String.format("Error message: %s. Service Name: %s",
-                                             exception.awsErrorDetails().errorMessage(), exception.awsErrorDetails().serviceName()));
+                exception.awsErrorDetails().errorMessage(), exception.awsErrorDetails().serviceName()));
         } catch (SdkException exception) {
             System.out.println("Error message " + exception.getMessage());
         }

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java

@@ -170,8 +170,7 @@ private void completeMpu(S3Client s3, String bucket, String key) {
             .build();
 
         CompleteMultipartUploadRequest completeMpuRequest2 =
-            CompleteMultipartUploadRequest.builder().bucket(bucket).key(key).uploadId("uploadId").multipartUpload(CompletedMultipartUpload.builder().parts(partETags).build())
-                .build();
+            CompleteMultipartUploadRequest.builder().bucket(bucket).key(key).uploadId("uploadId").multipartUpload(CompletedMultipartUpload.builder().parts(partETags).build()).build();
     }
 
     private void listObjects(S3Client s3, String bucket) {

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3RequestConstructor.java

@@ -147,8 +147,7 @@ public void requestconstructor() {
 
         s3.abortMultipartUpload(AbortMultipartUploadRequest.builder().bucket("name").key("key").uploadId("upload")
             .build());
-        s3.completeMultipartUpload(CompleteMultipartUploadRequest.builder().bucket("name").key("key").uploadId("upload").multipartUpload(CompletedMultipartUpload.builder().parts(new ArrayList<>()).build())
-            .build());
+        s3.completeMultipartUpload(CompleteMultipartUploadRequest.builder().bucket("name").key("key").uploadId("upload").multipartUpload(CompletedMultipartUpload.builder().parts(new ArrayList<>()).build()).build());
 
         s3.copyObject(CopyObjectRequest.builder()
             .build());
@@ -458,8 +457,7 @@ public void requestconstructor() {
             .build();
 
         List<Tag> tags = new ArrayList<>();
-        GetObjectTaggingResponse getObjectTaggingResult = GetObjectTaggingResponse.builder().tagSet(tags)
-            .build();
+        GetObjectTaggingResponse getObjectTaggingResult = GetObjectTaggingResponse.builder().tagSet(tags).build();
 
         PutBucketVersioningRequest setBucketVersioningConfigurationRequest =
             PutBucketVersioningRequest.builder().bucket(bucketName).versioningConfiguration(VersioningConfiguration.builder()

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3Streaming.java

@@ -61,7 +61,7 @@ void putObject_bucketKeyStreamMetadata(String bucket, String key, InputStream st
         HeadObjectResponse metadataWithLength = HeadObjectResponse.builder()
             .build();
         s3.putObject(PutObjectRequest.builder().bucket(bucket).key(key).contentLength(22L)
-            .build(), RequestBody.fromInputStream(stream, 22L));
+            .build(), RequestBody.fromInputStream(stream, 22));
 
 
         HeadObjectResponse metadataWithoutLength = HeadObjectResponse.builder()
@@ -105,7 +105,7 @@ void putObject_requestPojoWithInputStream(String bucket, String key) {
         HeadObjectResponse metadata = HeadObjectResponse.builder()
             .build();
         s3.putObject(PutObjectRequest.builder().bucket(bucket).key(key).websiteRedirectLocation("location").contentLength(11L)
-            .build(), RequestBody.fromInputStream(inputStream2, 11L));
+            .build(), RequestBody.fromInputStream(inputStream2, 11));
     }
 
     void putObject_requestPojoWithoutPayload(String bucket, String key) {
@@ -117,8 +117,7 @@ void putObject_requestPojoWithoutPayload(String bucket, String key) {
 
     void putObjectSetters() {
         List<Tag> tags = new ArrayList<>();
-        Tagging objectTagging = Tagging.builder().tagSet(tags)
-            .build();
+        Tagging objectTagging = Tagging.builder().tagSet(tags).build();
 
         PutObjectRequest putObjectRequest =
             PutObjectRequest.builder().bucket("bucket").key("key").websiteRedirectLocation("location")

v2-migration/pom.xml

@@ -34,7 +34,7 @@
 
     <properties>
         <awsjavasdk.version>${project.parent.version}</awsjavasdk.version>
-        <openrewrite.version>2.23.0</openrewrite.version>
+        <openrewrite.version>3.14.0</openrewrite.version>
         <junit.version>5.10.3</junit.version>
         <awssdkjavav1.version>1.12.472</awssdkjavav1.version>
     </properties>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java-8</artifactId>
-            <scope>runtime</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openrewrite.recipe</groupId>