Skip to content

Commit 9795ae4

Browse files
committed
Updating file names
1 parent 3b01c01 commit 9795ae4

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@
1919
import java.io.File;
2020
import java.io.IOException;
2121
import software.amazon.awssdk.annotations.SdkInternalApi;
22-
import software.amazon.awssdk.codegen.lite.regions.model.RegionPartitionsMetadata;
22+
import software.amazon.awssdk.codegen.lite.regions.model.PartitionsRegionsMetadata;
2323

2424
/**
25-
* Loads and parses the partitions.json file into {@link RegionPartitionsMetadata}.
25+
* Loads and parses the partitions.json file into {@link PartitionsRegionsMetadata}.
2626
*/
2727
@SdkInternalApi
28-
public final class RegionPartitionsMetadataLoader {
28+
public final class PartitionsRegionsMetadataLoader {
2929

30-
private RegionPartitionsMetadataLoader() {
30+
private PartitionsRegionsMetadataLoader() {
3131
}
3232

33-
public static RegionPartitionsMetadata build(File path) {
33+
public static PartitionsRegionsMetadata build(File path) {
3434
return loadPartitionFromStream(path, path.toString());
3535
}
3636

37-
private static RegionPartitionsMetadata loadPartitionFromStream(File stream, String location) {
37+
private static PartitionsRegionsMetadata loadPartitionFromStream(File stream, String location) {
3838

3939
try {
4040
return JSON.std.with(JSON.Feature.USE_IS_GETTERS)
41-
.beanFrom(RegionPartitionsMetadata.class, stream);
41+
.beanFrom(PartitionsRegionsMetadata.class, stream);
4242

4343
} catch (IOException | RuntimeException e) {
4444
throw new RuntimeException("Error while loading partitions file from " + location, e);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
import software.amazon.awssdk.annotations.Generated;
3939
import software.amazon.awssdk.annotations.SdkPublicApi;
4040
import software.amazon.awssdk.codegen.lite.PoetClass;
41-
import software.amazon.awssdk.codegen.lite.regions.model.RegionPartitionsMetadata;
41+
import software.amazon.awssdk.codegen.lite.regions.model.PartitionsRegionsMetadata;
4242
import software.amazon.awssdk.utils.Validate;
4343
import software.amazon.awssdk.utils.http.SdkHttpUtils;
4444

4545
public class RegionGenerator implements PoetClass {
4646

47-
private final RegionPartitionsMetadata partitions;
47+
private final PartitionsRegionsMetadata partitions;
4848
private final String basePackage;
4949

50-
public RegionGenerator(RegionPartitionsMetadata partitions,
50+
public RegionGenerator(PartitionsRegionsMetadata partitions,
5151
String basePackage) {
5252
this.partitions = partitions;
5353
this.basePackage = basePackage;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
import software.amazon.awssdk.annotations.SdkPublicApi;
3333
import software.amazon.awssdk.codegen.lite.PoetClass;
3434
import software.amazon.awssdk.codegen.lite.Utils;
35-
import software.amazon.awssdk.codegen.lite.regions.model.RegionPartitionMetadata;
35+
import software.amazon.awssdk.codegen.lite.regions.model.PartitionRegionsMetadata;
3636

3737
public class RegionMetadataGenerator implements PoetClass {
3838

39-
private final RegionPartitionMetadata partition;
39+
private final PartitionRegionsMetadata partition;
4040
private final String region;
4141
private final String regionDescription;
4242
private final String basePackage;
4343
private final String regionBasePackage;
4444

45-
public RegionMetadataGenerator(RegionPartitionMetadata partition,
45+
public RegionMetadataGenerator(PartitionRegionsMetadata partition,
4646
String region,
4747
String regionDescription,
4848
String basePackage,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@
3636
import software.amazon.awssdk.annotations.SdkPublicApi;
3737
import software.amazon.awssdk.codegen.lite.PoetClass;
3838
import software.amazon.awssdk.codegen.lite.Utils;
39-
import software.amazon.awssdk.codegen.lite.regions.model.RegionPartitionsMetadata;
39+
import software.amazon.awssdk.codegen.lite.regions.model.PartitionsRegionsMetadata;
4040
import software.amazon.awssdk.utils.ImmutableMap;
4141

4242
public class RegionMetadataProviderGenerator implements PoetClass {
4343

44-
private final RegionPartitionsMetadata partitions;
44+
private final PartitionsRegionsMetadata partitions;
4545
private final String basePackage;
4646
private final String regionBasePackage;
4747

48-
public RegionMetadataProviderGenerator(RegionPartitionsMetadata partitions,
48+
public RegionMetadataProviderGenerator(PartitionsRegionsMetadata partitions,
4949
String basePackage,
5050
String regionBasePackage) {
5151
this.partitions = partitions;
@@ -79,7 +79,7 @@ public ClassName className() {
7979
return ClassName.get(regionBasePackage, "GeneratedRegionMetadataProvider");
8080
}
8181

82-
private CodeBlock regions(RegionPartitionsMetadata partitions) {
82+
private CodeBlock regions(PartitionsRegionsMetadata partitions) {
8383
CodeBlock.Builder builder = CodeBlock.builder().add("$T.<Region, RegionMetadata>builder()", ImmutableMap.class);
8484

8585
partitions.getPartitions()
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
* This class models a single partition from partitions.json.
2424
*/
2525
@SdkInternalApi
26-
public final class RegionPartitionMetadata {
26+
public final class PartitionRegionsMetadata {
2727
private String id;
2828
private PartitionOutputs outputs;
2929
private String regionRegex;
3030
private Map<String, RegionMetadata> regions;
3131

32-
public RegionPartitionMetadata() {
32+
public PartitionRegionsMetadata() {
3333
}
3434

35-
public RegionPartitionMetadata(@JsonProperty(value = "id") String id,
36-
@JsonProperty(value = "outputs") PartitionOutputs outputs,
37-
@JsonProperty(value = "regionRegex") String regionRegex,
38-
@JsonProperty(value = "regions") Map<String, RegionMetadata> regions) {
35+
public PartitionRegionsMetadata(@JsonProperty(value = "id") String id,
36+
@JsonProperty(value = "outputs") PartitionOutputs outputs,
37+
@JsonProperty(value = "regionRegex") String regionRegex,
38+
@JsonProperty(value = "regions") Map<String, RegionMetadata> regions) {
3939
this.id = id;
4040
this.outputs = outputs;
4141
this.regionRegex = regionRegex;
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@
2424
* This class models the AWS partitions metadata from partitions.json.
2525
*/
2626
@SdkInternalApi
27-
public final class RegionPartitionsMetadata {
28-
private List<RegionPartitionMetadata> partitions;
27+
public final class PartitionsRegionsMetadata {
28+
private List<PartitionRegionsMetadata> partitions;
2929
private String version;
3030

31-
public RegionPartitionsMetadata() {
31+
public PartitionsRegionsMetadata() {
3232
}
3333

34-
public RegionPartitionsMetadata(@JsonProperty(value = "partitions") List<RegionPartitionMetadata> partitions,
35-
@JsonProperty(value = "version") String version) {
34+
public PartitionsRegionsMetadata(@JsonProperty(value = "partitions") List<PartitionRegionsMetadata> partitions,
35+
@JsonProperty(value = "version") String version) {
3636
this.partitions = Validate.paramNotNull(partitions, "partitions");
3737
this.version = Validate.paramNotNull(version, "version");
3838
}
3939

40-
public List<RegionPartitionMetadata> getPartitions() {
40+
public List<PartitionRegionsMetadata> getPartitions() {
4141
return partitions;
4242
}
4343

44-
public void setPartitions(List<RegionPartitionMetadata> partitions) {
44+
public void setPartitions(List<PartitionRegionsMetadata> partitions) {
4545
this.partitions = partitions;
4646
}
4747

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.junit.jupiter.api.BeforeEach;
2323
import org.junit.jupiter.api.Test;
2424
import software.amazon.awssdk.codegen.lite.regions.model.Partitions;
25-
import software.amazon.awssdk.codegen.lite.regions.model.RegionPartitionsMetadata;
26-
import software.amazon.awssdk.codegen.lite.regions.model.RegionPartitionMetadata;
25+
import software.amazon.awssdk.codegen.lite.regions.model.PartitionsRegionsMetadata;
26+
import software.amazon.awssdk.codegen.lite.regions.model.PartitionRegionsMetadata;
2727

2828
public class RegionGenerationTest {
2929

@@ -37,15 +37,15 @@ public class RegionGenerationTest {
3737
private File endpoints;
3838
private File partitionsFile;
3939
private Partitions partitions;
40-
private RegionPartitionsMetadata partitionsRegions;
40+
private PartitionsRegionsMetadata partitionsRegions;
4141

4242

4343
@BeforeEach
4444
public void before() throws Exception {
4545
this.endpoints = Paths.get(getClass().getResource(ENDPOINTS).toURI()).toFile();
4646
this.partitionsFile = Paths.get(getClass().getResource(PARTITIONS).toURI()).toFile();
4747
this.partitions = RegionMetadataLoader.build(endpoints);
48-
this.partitionsRegions = RegionPartitionsMetadataLoader.build(partitionsFile);
48+
this.partitionsRegions = PartitionsRegionsMetadataLoader.build(partitionsFile);
4949
}
5050

5151
@Test
@@ -56,7 +56,7 @@ public void regionClass() {
5656

5757
@Test
5858
public void regionMetadataClass() {
59-
RegionPartitionMetadata partition = partitionsRegions.getPartitions().get(0);
59+
PartitionRegionsMetadata partition = partitionsRegions.getPartitions().get(0);
6060
RegionMetadataGenerator metadataGenerator = new RegionMetadataGenerator(partition,
6161
"us-east-1",
6262
"US East (N. Virginia)",

0 commit comments

Comments
 (0)