Migrate PartitionMetadataProvider generation to use partitions.json (#6728)

* Migrate PartitionProvider generation to partitions.json

* Update changelog

Author: S-Saranya1

.changes/next-release/feature-AWSSDKforJavav2-31c2f98.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Migrate PartitionMetadataProvider code generation from endpoints.json to partitions.json"
+}

codegen-lite-maven-plugin/src/main/java/software/amazon/awssdk/codegen/lite/maven/plugin/RegionGenerationMojo.java

@@ -77,7 +77,7 @@ public void execute() throws MojoExecutionException {
         generateRegionClass(baseSourcesDirectory, regionPartitions);
         generateServiceMetadata(baseSourcesDirectory, partitions);
         generateRegions(baseSourcesDirectory, regionPartitions);
-        generatePartitionProvider(baseSourcesDirectory, partitions);
+        generatePartitionProvider(baseSourcesDirectory, regionPartitions);
         generateRegionProvider(baseSourcesDirectory, regionPartitions);
         generateServiceProvider(baseSourcesDirectory, partitions);
         generateEndpointTags(baseSourcesDirectory, partitions);
@@ -125,7 +125,7 @@ public void generateRegions(Path baseSourcesDirectory, PartitionsRegionsMetadata
                                                                .generate()));
     }
 
-    public void generatePartitionProvider(Path baseSourcesDirectory, Partitions partitions) {
+    public void generatePartitionProvider(Path baseSourcesDirectory, PartitionsRegionsMetadata partitions) {
         Path sourcesDirectory = baseSourcesDirectory.resolve(StringUtils.replace(REGION_BASE, ".", "/"));
         new CodeGenerator(sourcesDirectory.toString(), new PartitionMetadataProviderGenerator(partitions,
                                                                                               PARTITION_METADATA_BASE,

codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataProviderGenerator.java

@@ -35,15 +35,15 @@
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.codegen.lite.PoetClass;
 import software.amazon.awssdk.codegen.lite.Utils;
-import software.amazon.awssdk.codegen.lite.regions.model.Partitions;
+import software.amazon.awssdk.codegen.lite.regions.model.PartitionsRegionsMetadata;
 import software.amazon.awssdk.utils.ImmutableMap;
 
 public class PartitionMetadataProviderGenerator implements PoetClass {
-    private final Partitions partitions;
+    private final PartitionsRegionsMetadata partitions;
     private final String basePackage;
     private final String regionBasePackage;
 
-    public PartitionMetadataProviderGenerator(Partitions partitions,
+    public PartitionMetadataProviderGenerator(PartitionsRegionsMetadata partitions,
                                            String basePackage,
                                            String regionBasePackage) {
         this.partitions = partitions;
@@ -78,11 +78,11 @@ public ClassName className() {
         return ClassName.get(regionBasePackage, "GeneratedPartitionMetadataProvider");
     }
 
-    private CodeBlock partitions(Partitions partitions) {
+    private CodeBlock partitions(PartitionsRegionsMetadata partitions) {
         CodeBlock.Builder builder = CodeBlock.builder().add("$T.<String, PartitionMetadata>builder()", ImmutableMap.class);
 
         partitions.getPartitions()
-                  .forEach(p -> builder.add(".put($S, new $T())", p.getPartition(), partitionMetadataClass(p.getPartition())));
+                  .forEach(p -> builder.add(".put($S, new $T())", p.getId(), partitionMetadataClass(p.getId())));
 
         return builder.add(".build()").build();
     }

codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java

@@ -122,7 +122,7 @@ public void endpointTagClass() {
     @Test
     public void partitionMetadataProviderClass() {
         PartitionMetadataProviderGenerator partitionMetadataProviderGenerator =
-            new PartitionMetadataProviderGenerator(partitions, PARTITION_METADATA_BASE, REGION_BASE);
+            new PartitionMetadataProviderGenerator(partitionsRegions, PARTITION_METADATA_BASE, REGION_BASE);
 
         assertThat(partitionMetadataProviderGenerator, generatesTo("partition-metadata-provider.java"));
     }

codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/partition-metadata-provider.java

@@ -4,7 +4,10 @@
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.regions.partitionmetadata.AwsCnPartitionMetadata;
+import software.amazon.awssdk.regions.partitionmetadata.AwsEuscPartitionMetadata;
 import software.amazon.awssdk.regions.partitionmetadata.AwsIsoBPartitionMetadata;
+import software.amazon.awssdk.regions.partitionmetadata.AwsIsoEPartitionMetadata;
+import software.amazon.awssdk.regions.partitionmetadata.AwsIsoFPartitionMetadata;
 import software.amazon.awssdk.regions.partitionmetadata.AwsIsoPartitionMetadata;
 import software.amazon.awssdk.regions.partitionmetadata.AwsPartitionMetadata;
 import software.amazon.awssdk.regions.partitionmetadata.AwsUsGovPartitionMetadata;
@@ -16,7 +19,8 @@ public final class GeneratedPartitionMetadataProvider implements PartitionMetada
     private static final Map<String, PartitionMetadata> PARTITION_METADATA = ImmutableMap.<String, PartitionMetadata> builder()
                                                                                          .put("aws", new AwsPartitionMetadata()).put("aws-cn", new AwsCnPartitionMetadata())
                                                                                          .put("aws-us-gov", new AwsUsGovPartitionMetadata()).put("aws-iso", new AwsIsoPartitionMetadata())
-                                                                                         .put("aws-iso-b", new AwsIsoBPartitionMetadata()).build();
+                                                                                         .put("aws-iso-b", new AwsIsoBPartitionMetadata()).put("aws-iso-e", new AwsIsoEPartitionMetadata())
+                                                                                         .put("aws-iso-f", new AwsIsoFPartitionMetadata()).put("aws-eusc", new AwsEuscPartitionMetadata()).build();
 
     public PartitionMetadata partitionMetadata(String partition) {
         return PARTITION_METADATA.get(partition);