Fix package/file naming and test (#5426)

Author: davidh44

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

@@ -95,7 +95,7 @@ private static Path downloadFile(S3Client s3, String bucket, String key, Path ds
     }
 
     private static PutObjectResponse uploadFile(S3Client s3, String bucket, String key, Path source) throws IOException {
-        PutObjectResponse result = s3.putObject(PutObjectRequest.builder()
+        PutObjectResponse result = s3.putObject(PutObjectRequest.builder().bucket(bucket).key(key)
             .build(), RequestBody.fromFile(source.toFile()));
 
         return result;

v2-migration/src/main/resources/META-INF/rewrite/s3-getobject-constructor-to-fluent.yml

@@ -15,7 +15,7 @@
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: software.amazon.awssdk.v2migration.S3GetObjectConstructorToFluent
-displayName: Change auth related classes
+displayName: Change GetObject constructors to fluent builder calls
 recipeList:
   - software.amazon.awssdk.v2migration.ConstructorToFluent:
       clzzFqcn: com.amazonaws.services.s3.model.GetObjectRequest

v2-migration/src/main/resources/META-INF/rewrite/s3-putbject-constructor-to-fluent.yml renamed to v2-migration/src/main/resources/META-INF/rewrite/s3-putobject-constructor-to-fluent.yml

@@ -14,10 +14,10 @@
 #
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: software.amazon.awssdk.S3PutObjectConstructorToFluent
+name: software.amazon.awssdk.v2migration.S3PutObjectConstructorToFluent
 displayName: Change PutObject constructors to fluent builder calls
 recipeList:
-  - software.amazon.awssdk.migration.internal.recipe.ConstructorToFluent:
+  - software.amazon.awssdk.v2migration.ConstructorToFluent:
       clzzFqcn: com.amazonaws.services.s3.model.PutObjectRequest
       parameterTypes:
         - java.lang.String

v2-migration/src/test/java/software/amazon/awssdk/v2migration/internal/recipe/ConstructorToFluentTest.java renamed to v2-migration/src/test/java/software/amazon/awssdk/v2migration/ConstructorToFluentTest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.v2migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.openrewrite.java.Assertions.java;
@@ -26,7 +26,6 @@
 import org.openrewrite.java.Java8Parser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
-import software.amazon.awssdk.v2migration.ConstructorToFluent;
 
 /**
  * Recipe that remaps invocations of model constructors that take some members as constructor parameters, so that the

v2-migration/src/test/java/software/amazon/awssdk/v2migration/internal/recipe/NumberToDurationTest.java renamed to v2-migration/src/test/java/software/amazon/awssdk/v2migration/NumberToDurationTest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.v2migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
 import static org.openrewrite.java.Assertions.java;
 
@@ -23,7 +23,6 @@
 import org.junit.jupiter.api.condition.JRE;
 import org.openrewrite.java.Java8Parser;
 import org.openrewrite.test.RewriteTest;
-import software.amazon.awssdk.v2migration.NumberToDuration;
 
 public class NumberToDurationTest implements RewriteTest {
 

v2-migration/src/test/java/software/amazon/awssdk/v2migration/internal/recipe/S3StreamingResponseToV2Test.java renamed to v2-migration/src/test/java/software/amazon/awssdk/v2migration/S3StreamingResponseToV2Test.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.v2migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
 import static org.openrewrite.java.Assertions.java;
 
@@ -23,7 +23,6 @@
 import org.openrewrite.java.Java8Parser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
-import software.amazon.awssdk.v2migration.S3StreamingResponseToV2;
 
 public class S3StreamingResponseToV2Test implements RewriteTest {
     @Override