Update recipe names to be consistent

Author: zoewangg

build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml

@@ -216,8 +216,8 @@
     <!-- Skip the warning since this source is forked from openrewrite -->
     <Match>
         <Or>
-            <Class name="software.amazon.awssdk.migration.recipe.ChangeSdkType"/>
-            <Class name="software.amazon.awssdk.migration.recipe.ChangeSdkType$ChangeTypeVisitor"/>
+            <Class name="software.amazon.awssdk.v2migration.ChangeSdkType"/>
+            <Class name="software.amazon.awssdk.v2migration.ChangeSdkType$ChangeTypeVisitor"/>
         </Or>
         <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
     </Match>

test/v2-migration-tool-tests/src/test/resources/run-test

@@ -45,7 +45,7 @@ def run_maven_test(version):
 
     subprocess.run(["mvn", "org.openrewrite.maven:rewrite-maven-plugin:run",
                     "-Drewrite.recipeArtifactCoordinates=software.amazon.awssdk:v2-migration-tool:"+ version,
-                    "-Drewrite.activeRecipes=software.amazon.awssdk.UpgradeJavaSdk2"], cwd=TARGET_DIR_MAVEN, check=True)
+                    "-Drewrite.activeRecipes=software.amazon.awssdk.v2migration.AwsSdkForJavaV1ToV2"], cwd=TARGET_DIR_MAVEN, check=True)
     shutil.rmtree(os.path.join(TARGET_DIR_MAVEN, "target"))
 
     pom_file = Path(AFTER_POM)
@@ -66,7 +66,7 @@ def run_gradle_test(version):
     init_file.write_text(init_file.read_text().replace('V2_VERSION', version))
 
     subprocess.run(["./gradlew", "rewriteRun", "--init-script", "init.gradle",
-                    "-Drewrite.activeRecipes=software.amazon.awssdk.UpgradeJavaSdk2"], cwd=TARGET_DIR_GRADLE, check=True)
+                    "-Drewrite.activeRecipes=software.amazon.awssdk.v2migration.AwsSdkForJavaV1ToV2"], cwd=TARGET_DIR_GRADLE, check=True)
 
     # only compares source directory and build.gradle and skip non-code directories such as gradle wrapper
     actual_source = os.path.join(TARGET_DIR_GRADLE, "src")

v2-migration-tool/README.md

@@ -18,7 +18,7 @@ find the latest version.
 ```
 mvn org.openrewrite.maven:rewrite-maven-plugin:dryRun \
   -Drewrite.recipeArtifactCoordinates=software.amazon.awssdk:v2-migration-tool:{sdkversion} \
-  -Drewrite.activeRecipes=software.amazon.awssdk.UpgradeJavaSdk2
+  -Drewrite.activeRecipes=software.amazon.awssdk.v2migration.AwsSdkForJavaV1ToV2
 ```
 
 - Run
@@ -28,7 +28,7 @@ With this mode, it runs the SDK recipes and applies the changes locally.
 ```
 mvn org.openrewrite.maven:rewrite-maven-plugin:run \
   -Drewrite.recipeArtifactCoordinates=software.amazon.awssdk:v2-migration-tool:{sdkversion} \
-  -Drewrite.activeRecipes=software.amazon.awssdk.UpgradeJavaSdk2
+  -Drewrite.activeRecipes=software.amazon.awssdk.v2migration.AwsSdkForJavaV1ToV2
 ```
 
 

v2-migration-tool/pom.xml

@@ -217,7 +217,7 @@
                     <archive>
                         <manifestEntries>
 <!--                            TODO: is this really needed since we don't expect users to use our recipe classes directly ? -->
-                            <Automatic-Module-Name>software.amazon.awssdk.migration</Automatic-Module-Name>
+                            <Automatic-Module-Name>software.amazon.awssdk.v2migration</Automatic-Module-Name>
                         </manifestEntries>
                     </archive>
                 </configuration>

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/recipe/AddCommentToMethod.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/AddCommentToMethod.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/recipe/ChangeSdkType.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/ChangeSdkType.java

@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.recipe;
+package software.amazon.awssdk.v2migration;
 
-import static software.amazon.awssdk.migration.internal.utils.NamingConversionUtils.getV2Equivalent;
-import static software.amazon.awssdk.migration.internal.utils.NamingConversionUtils.getV2ModelPackageWildCardEquivalent;
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isV1ClientClass;
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isV1ModelClass;
+import static software.amazon.awssdk.v2migration.internal.utils.NamingConversionUtils.getV2Equivalent;
+import static software.amazon.awssdk.v2migration.internal.utils.NamingConversionUtils.getV2ModelPackageWildCardEquivalent;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV1ClientClass;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV1ModelClass;
 
 import java.util.ArrayList;
 import java.util.Arrays;

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/recipe/ConstructorToFluent.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/ConstructorToFluent.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/recipe/HttpSettingsToHttpClient.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/HttpSettingsToHttpClient.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -43,11 +43,11 @@
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
-import software.amazon.awssdk.migration.internal.utils.IdentifierUtils;
-import software.amazon.awssdk.migration.internal.utils.SdkTypeUtils;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.Pair;
+import software.amazon.awssdk.v2migration.internal.utils.IdentifierUtils;
+import software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils;
 
 /**
  * This recipe moves the HTTP settings such as maxConnections configured on v1 ClientConfiguration to v2 ApacheHttpClient builder

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/recipe/NewClassToBuilder.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/NewClassToBuilder.java

@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isEligibleToConvertToBuilder;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isEligibleToConvertToBuilder;
 
 import java.util.Collections;
 import org.openrewrite.ExecutionContext;
@@ -31,9 +31,8 @@
 import org.openrewrite.java.tree.Space;
 import org.openrewrite.marker.Markers;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.migration.internal.utils.NamingUtils;
-import software.amazon.awssdk.migration.internal.utils.SdkTypeUtils;
-import software.amazon.awssdk.migration.recipe.NewClassToBuilderPattern;
+import software.amazon.awssdk.v2migration.internal.utils.NamingUtils;
+import software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils;
 
 /**
  * Internal recipe that converts new class creation to the builder pattern.

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/recipe/NewClassToBuilderPattern.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/NewClassToBuilderPattern.java

@@ -13,14 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.recipe;
+package software.amazon.awssdk.v2migration;
 
 import java.util.Arrays;
 import java.util.List;
 import org.openrewrite.Recipe;
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.migration.internal.recipe.NewClassToBuilder;
-import software.amazon.awssdk.migration.internal.recipe.V1SetterToV2;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 
 /**
  * Recipe that converts objects creation using {@code new} such as
@@ -45,7 +43,7 @@
  *     sqs.sendMessage(sendMessage);
  * }
  */
-@SdkPublicApi
+@SdkInternalApi
 public class NewClassToBuilderPattern extends Recipe {
     @Override
     public String getDisplayName() {

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/recipe/NewClassToStaticFactory.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/NewClassToStaticFactory.java

@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.recipe;
+package software.amazon.awssdk.v2migration;
 
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.V2_CORE_CLASSES_WITH_STATIC_FACTORY;
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isEligibleToConvertToStaticFactory;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.V2_CORE_CLASSES_WITH_STATIC_FACTORY;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isEligibleToConvertToStaticFactory;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Recipe;

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/recipe/NumberToDuration.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/NumberToDuration.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/recipe/S3StreamingResponseToV2.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/S3StreamingResponseToV2.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
 import java.util.Collections;
 import java.util.List;
@@ -33,7 +33,7 @@
 import org.openrewrite.java.tree.TypeUtils;
 import org.openrewrite.marker.Markers;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.migration.internal.utils.IdentifierUtils;
+import software.amazon.awssdk.v2migration.internal.utils.IdentifierUtils;
 
 @SdkInternalApi
 public class S3StreamingResponseToV2 extends Recipe {

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/recipe/V1BuilderVariationsToV2Builder.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/V1BuilderVariationsToV2Builder.java

@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.recipe;
+package software.amazon.awssdk.v2migration;
 
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isV2AsyncClientClass;
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isV2ClientBuilder;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV2AsyncClientClass;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV2ClientBuilder;
 
 import java.util.Collections;
 import org.openrewrite.ExecutionContext;
@@ -33,7 +33,7 @@
 import org.openrewrite.java.tree.TypeUtils;
 import org.openrewrite.marker.Markers;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.migration.internal.utils.SdkTypeUtils;
+import software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils;
 
 /**
  * Internal recipe that renames V1 client builder variations. For example: {@code SqsClientBuilder.standard().build()} to

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/recipe/V1GetterToV2.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/V1GetterToV2.java

@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isV2ModelClass;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV2ModelClass;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Recipe;
@@ -24,7 +24,7 @@
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.JavaType;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.migration.internal.utils.NamingUtils;
+import software.amazon.awssdk.v2migration.internal.utils.NamingUtils;
 
 @SdkInternalApi
 public class V1GetterToV2 extends Recipe {

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/recipe/V1SetterToV2.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/V1SetterToV2.java

@@ -13,10 +13,10 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isEligibleToConvertToBuilder;
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isV2ClientClass;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isEligibleToConvertToBuilder;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV2ClientClass;
 
 import java.util.Map;
 import org.openrewrite.ExecutionContext;
@@ -28,9 +28,8 @@
 import org.openrewrite.java.tree.JavaType;
 import org.openrewrite.java.tree.TypeUtils;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.migration.internal.utils.NamingUtils;
-import software.amazon.awssdk.migration.recipe.NewClassToBuilderPattern;
 import software.amazon.awssdk.utils.ImmutableMap;
+import software.amazon.awssdk.v2migration.internal.utils.NamingUtils;
 
 /**
  * Internal recipe that renames fluent V1 setters (withers), to V2 equivalents

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/recipe/WrapSdkClientBuilderRegionStr.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/WrapSdkClientBuilderRegionStr.java

@@ -13,9 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.recipe;
+package software.amazon.awssdk.v2migration;
 
-import static software.amazon.awssdk.migration.internal.utils.SdkTypeUtils.isV2ClientClass;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV2ClientClass;
 
 import java.util.ArrayList;
 import java.util.List;

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/utils/IdentifierUtils.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/internal/utils/IdentifierUtils.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.utils;
+package software.amazon.awssdk.v2migration.internal.utils;
 
 import java.util.Collections;
 import java.util.List;

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/utils/NamingConversionUtils.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/internal/utils/NamingConversionUtils.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.utils;
+package software.amazon.awssdk.v2migration.internal.utils;
 
 import java.util.stream.Stream;
 import software.amazon.awssdk.annotations.SdkInternalApi;

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/utils/NamingUtils.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/internal/utils/NamingUtils.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.utils;
+package software.amazon.awssdk.v2migration.internal.utils;
 
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.utils.StringUtils;

v2-migration-tool/src/main/java/software/amazon/awssdk/migration/internal/utils/SdkTypeUtils.java renamed to v2-migration-tool/src/main/java/software/amazon/awssdk/v2migration/internal/utils/SdkTypeUtils.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.migration.internal.utils;
+package software.amazon.awssdk.v2migration.internal.utils;
 
 import java.util.Arrays;
 import java.util.HashSet;

v2-migration-tool/src/main/resources/META-INF/rewrite/aws-sdk-java-v1-to-v2.yml

@@ -0,0 +1,35 @@
+#
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#  http://aws.amazon.com/apache2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: software.amazon.awssdk.v2migration.AwsSdkForJavaV1ToV2
+displayName: Migrate from the AWS SDK for Java v1 to the AWS SDK for Java v2
+description: This recipe will apply changes required for migrating from the AWS SDK for Java v1 to the AWS SDK for Java v2.
+tags:
+  - aws
+  - sdk
+recipeList:
+  - software.amazon.awssdk.v2migration.UpgradeSdkDependencies
+  - software.amazon.awssdk.v2migration.S3GetObjectConstructorToFluent
+  - software.amazon.awssdk.v2migration.S3StreamingResponseToV2
+  - software.amazon.awssdk.v2migration.ChangeSdkType
+  - software.amazon.awssdk.v2migration.ChangeSdkCoreTypes
+  # At this point, all classes should be changed to v2 equivalents
+  - software.amazon.awssdk.v2migration.V1BuilderVariationsToV2Builder
+  - software.amazon.awssdk.v2migration.NewClassToBuilderPattern
+  - software.amazon.awssdk.v2migration.NewClassToStaticFactory
+  - software.amazon.awssdk.v2migration.V1GetterToV2
+  - software.amazon.awssdk.v2migration.HttpSettingsToHttpClient
+  - software.amazon.awssdk.v2migration.WrapSdkClientBuilderRegionStr

v2-migration-tool/src/main/resources/META-INF/rewrite/change-auth-types.yml

@@ -15,7 +15,7 @@
 # TODO: handle Signer classes
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: software.amazon.awssdk.ChangeAuthTypes
+name: software.amazon.awssdk.v2migration.ChangeAuthTypes
 displayName: Change auth related classes
 recipeList:
   - org.openrewrite.java.ChangeMethodName: