Skip to content

Commit 1d30afa

Browse files
S-Saranya1S-Saranya1
committed
Updating the test files
1 parent 4fd9154 commit 1d30afa

File tree

4 files changed

+328
-32
lines changed

4 files changed

+328
-32
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@ private void regions(TypeSpec.Builder builder) {
100100
.add("$T.unmodifiableList($T.asList(", Collections.class, Arrays.class);
101101

102102
String regionsCodeBlock = regions.stream().map(r -> {
103+
boolean isGlobal = r.toLowerCase().contains("global");
103104
builder.addField(FieldSpec.builder(className(), regionName(r))
104105
.addModifiers(PUBLIC, STATIC, FINAL)
105-
.initializer("$T.of($S)", className(), r)
106+
.initializer(isGlobal ? "$T.of($S, true)" : "$T.of($S)", className(), r)
106107
.build());
107108
return regionName(r);
108109
}).collect(Collectors.joining(", "));

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,29 @@
2727
public class RegionGenerationTest {
2828

2929
private static final String ENDPOINTS = "/software/amazon/awssdk/codegen/lite/test-endpoints.json";
30+
private static final String PARTITIONS = "/software/amazon/awssdk/codegen/lite/test-partitions.json.resource";
3031
private static final String SERVICE_METADATA_BASE = "software.amazon.awssdk.regions.servicemetadata";
3132
private static final String REGION_METADATA_BASE = "software.amazon.awssdk.regions.regionmetadata";
3233
private static final String PARTITION_METADATA_BASE = "software.amazon.awssdk.regions.partitionmetadata";
3334
private static final String REGION_BASE = "software.amazon.awssdk.regions";
3435

3536
private File endpoints;
37+
private File partitionsFile;
3638
private Partitions partitions;
39+
private Partitions partitionsRegions;
40+
3741

3842
@BeforeEach
3943
public void before() throws Exception {
4044
this.endpoints = Paths.get(getClass().getResource(ENDPOINTS).toURI()).toFile();
45+
this.partitionsFile = Paths.get(getClass().getResource(PARTITIONS).toURI()).toFile();
4146
this.partitions = RegionMetadataLoader.build(endpoints);
47+
this.partitionsRegions = RegionMetadataLoader.build(partitionsFile);
4248
}
4349

4450
@Test
4551
public void regionClass() {
46-
RegionGenerator regions = new RegionGenerator(partitions, REGION_BASE);
52+
RegionGenerator regions = new RegionGenerator(partitionsRegions, REGION_BASE);
4753
assertThat(regions, generatesTo("regions.java"));
4854
}
4955

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

Lines changed: 64 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,18 @@
3636
@SdkPublicApi
3737
@Generated("software.amazon.awssdk:codegen")
3838
public final class Region {
39-
public static final Region AP_SOUTH_1 = Region.of("ap-south-1");
40-
41-
public static final Region EU_SOUTH_1 = Region.of("eu-south-1");
42-
43-
public static final Region US_GOV_EAST_1 = Region.of("us-gov-east-1");
39+
public static final Region ME_CENTRAL_1 = Region.of("me-central-1");
4440

45-
public static final Region CA_CENTRAL_1 = Region.of("ca-central-1");
41+
public static final Region AWS_CN_GLOBAL = Region.of("aws-cn-global", true);
4642

47-
public static final Region EU_CENTRAL_1 = Region.of("eu-central-1");
48-
49-
public static final Region US_ISO_WEST_1 = Region.of("us-iso-west-1");
43+
public static final Region US_ISOF_SOUTH_1 = Region.of("us-isof-south-1");
5044

5145
public static final Region US_WEST_1 = Region.of("us-west-1");
5246

5347
public static final Region US_WEST_2 = Region.of("us-west-2");
5448

5549
public static final Region AF_SOUTH_1 = Region.of("af-south-1");
5650

57-
public static final Region EU_NORTH_1 = Region.of("eu-north-1");
58-
59-
public static final Region EU_WEST_3 = Region.of("eu-west-3");
60-
61-
public static final Region EU_WEST_2 = Region.of("eu-west-2");
62-
63-
public static final Region EU_WEST_1 = Region.of("eu-west-1");
64-
6551
public static final Region AP_NORTHEAST_3 = Region.of("ap-northeast-3");
6652

6753
public static final Region AP_NORTHEAST_2 = Region.of("ap-northeast-2");
@@ -72,41 +58,89 @@ public final class Region {
7258

7359
public static final Region SA_EAST_1 = Region.of("sa-east-1");
7460

75-
public static final Region AP_EAST_1 = Region.of("ap-east-1");
76-
7761
public static final Region CN_NORTH_1 = Region.of("cn-north-1");
7862

79-
public static final Region US_GOV_WEST_1 = Region.of("us-gov-west-1");
80-
8163
public static final Region AP_SOUTHEAST_1 = Region.of("ap-southeast-1");
8264

8365
public static final Region AP_SOUTHEAST_2 = Region.of("ap-southeast-2");
8466

85-
public static final Region US_ISO_EAST_1 = Region.of("us-iso-east-1");
67+
public static final Region AP_SOUTHEAST_3 = Region.of("ap-southeast-3");
68+
69+
public static final Region AP_SOUTHEAST_4 = Region.of("ap-southeast-4");
70+
71+
public static final Region AP_SOUTHEAST_5 = Region.of("ap-southeast-5");
8672

8773
public static final Region US_EAST_1 = Region.of("us-east-1");
8874

8975
public static final Region US_EAST_2 = Region.of("us-east-2");
9076

77+
public static final Region AP_SOUTHEAST_7 = Region.of("ap-southeast-7");
78+
9179
public static final Region CN_NORTHWEST_1 = Region.of("cn-northwest-1");
9280

93-
public static final Region US_ISOB_EAST_1 = Region.of("us-isob-east-1");
81+
public static final Region AP_SOUTH_2 = Region.of("ap-south-2");
82+
83+
public static final Region AP_SOUTH_1 = Region.of("ap-south-1");
84+
85+
public static final Region EU_SOUTH_1 = Region.of("eu-south-1");
86+
87+
public static final Region EU_SOUTH_2 = Region.of("eu-south-2");
88+
89+
public static final Region US_GOV_EAST_1 = Region.of("us-gov-east-1");
90+
91+
public static final Region IL_CENTRAL_1 = Region.of("il-central-1");
92+
93+
public static final Region CA_CENTRAL_1 = Region.of("ca-central-1");
94+
95+
public static final Region MX_CENTRAL_1 = Region.of("mx-central-1");
96+
97+
public static final Region EU_CENTRAL_1 = Region.of("eu-central-1");
98+
99+
public static final Region US_ISO_WEST_1 = Region.of("us-iso-west-1");
100+
101+
public static final Region EUSC_DE_EAST_1 = Region.of("eusc-de-east-1");
102+
103+
public static final Region EU_CENTRAL_2 = Region.of("eu-central-2");
104+
105+
public static final Region EU_ISOE_WEST_1 = Region.of("eu-isoe-west-1");
94106

95107
public static final Region AWS_GLOBAL = Region.of("aws-global", true);
96108

97-
public static final Region AWS_CN_GLOBAL = Region.of("aws-cn-global", true);
109+
public static final Region EU_NORTH_1 = Region.of("eu-north-1");
98110

99-
public static final Region AWS_US_GOV_GLOBAL = Region.of("aws-us-gov-global", true);
111+
public static final Region EU_WEST_3 = Region.of("eu-west-3");
112+
113+
public static final Region EU_WEST_2 = Region.of("eu-west-2");
114+
115+
public static final Region EU_WEST_1 = Region.of("eu-west-1");
100116

101117
public static final Region AWS_ISO_GLOBAL = Region.of("aws-iso-global", true);
102118

119+
public static final Region AP_EAST_1 = Region.of("ap-east-1");
120+
121+
public static final Region CA_WEST_1 = Region.of("ca-west-1");
122+
123+
public static final Region US_GOV_WEST_1 = Region.of("us-gov-west-1");
124+
125+
public static final Region US_ISO_EAST_1 = Region.of("us-iso-east-1");
126+
103127
public static final Region AWS_ISO_B_GLOBAL = Region.of("aws-iso-b-global", true);
104128

105-
private static final List<Region> REGIONS = Collections.unmodifiableList(Arrays.asList(AP_SOUTH_1, EU_SOUTH_1, US_GOV_EAST_1,
106-
CA_CENTRAL_1, EU_CENTRAL_1, US_ISO_WEST_1, US_WEST_1, US_WEST_2, AF_SOUTH_1, EU_NORTH_1, EU_WEST_3, EU_WEST_2,
107-
EU_WEST_1, AP_NORTHEAST_3, AP_NORTHEAST_2, AP_NORTHEAST_1, ME_SOUTH_1, SA_EAST_1, AP_EAST_1, CN_NORTH_1,
108-
US_GOV_WEST_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2, US_ISO_EAST_1, US_EAST_1, US_EAST_2, CN_NORTHWEST_1, US_ISOB_EAST_1,
109-
AWS_GLOBAL, AWS_CN_GLOBAL, AWS_US_GOV_GLOBAL, AWS_ISO_GLOBAL, AWS_ISO_B_GLOBAL));
129+
public static final Region AWS_ISO_F_GLOBAL = Region.of("aws-iso-f-global", true);
130+
131+
public static final Region AWS_US_GOV_GLOBAL = Region.of("aws-us-gov-global", true);
132+
133+
public static final Region US_ISOB_EAST_1 = Region.of("us-isob-east-1");
134+
135+
public static final Region US_ISOF_EAST_1 = Region.of("us-isof-east-1");
136+
137+
private static final List<Region> REGIONS = Collections.unmodifiableList(Arrays.asList(ME_CENTRAL_1, AWS_CN_GLOBAL,
138+
US_ISOF_SOUTH_1, US_WEST_1, US_WEST_2, AF_SOUTH_1, AP_NORTHEAST_3, AP_NORTHEAST_2, AP_NORTHEAST_1, ME_SOUTH_1,
139+
SA_EAST_1, CN_NORTH_1, AP_SOUTHEAST_1, AP_SOUTHEAST_2, AP_SOUTHEAST_3, AP_SOUTHEAST_4, AP_SOUTHEAST_5, US_EAST_1,
140+
US_EAST_2, AP_SOUTHEAST_7, CN_NORTHWEST_1, AP_SOUTH_2, AP_SOUTH_1, EU_SOUTH_1, EU_SOUTH_2, US_GOV_EAST_1,
141+
IL_CENTRAL_1, CA_CENTRAL_1, MX_CENTRAL_1, EU_CENTRAL_1, US_ISO_WEST_1, EUSC_DE_EAST_1, EU_CENTRAL_2, EU_ISOE_WEST_1,
142+
AWS_GLOBAL, EU_NORTH_1, EU_WEST_3, EU_WEST_2, EU_WEST_1, AWS_ISO_GLOBAL, AP_EAST_1, CA_WEST_1, US_GOV_WEST_1,
143+
US_ISO_EAST_1, AWS_ISO_B_GLOBAL, AWS_ISO_F_GLOBAL, AWS_US_GOV_GLOBAL, US_ISOB_EAST_1, US_ISOF_EAST_1));
110144

111145
private final boolean isGlobalRegion;
112146

0 commit comments

Comments
 (0)