Skip to content

Commit 9514b4a

Browse files
committed
Return Builders instead of SmithyBuilders
This commit updates all instances where a generic SmithyBuilder<> was returned to return the specific implementing Builder. This means users of these methods can easily use the Builder's functionality without using a cast.
1 parent c7a8192 commit 9514b4a

File tree

23 files changed

+23
-34
lines changed

23 files changed

+23
-34
lines changed

smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import software.amazon.smithy.model.traits.AbstractTraitBuilder;
2626
import software.amazon.smithy.model.traits.Trait;
2727
import software.amazon.smithy.utils.ListUtils;
28-
import software.amazon.smithy.utils.SmithyBuilder;
2928
import software.amazon.smithy.utils.ToSmithyBuilder;
3029

3130
/**
@@ -75,7 +74,7 @@ protected Node createNode() {
7574
}
7675

7776
@Override
78-
public SmithyBuilder<CfnResourceTrait> toBuilder() {
77+
public Builder toBuilder() {
7978
return builder().sourceLocation(getSourceLocation()).name(name).additionalSchemas(additionalSchemas);
8079
}
8180

smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Handler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public Node toNode() {
6161
}
6262

6363
@Override
64-
public SmithyBuilder<Handler> toBuilder() {
64+
public Builder toBuilder() {
6565
return builder()
6666
.permissions(permissions);
6767
}

smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Property.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public Node toNode() {
6262
}
6363

6464
@Override
65-
public SmithyBuilder<Property> toBuilder() {
65+
public Builder toBuilder() {
6666
return builder()
6767
.insertionOrder(insertionOrder)
6868
.dependencies(dependencies)

smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/Partition.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;
1717
import software.amazon.smithy.utils.BuilderRef;
1818
import software.amazon.smithy.utils.ListUtils;
19-
import software.amazon.smithy.utils.SmithyBuilder;
2019
import software.amazon.smithy.utils.SmithyUnstableApi;
2120
import software.amazon.smithy.utils.ToSmithyBuilder;
2221

@@ -117,7 +116,7 @@ public SourceLocation getSourceLocation() {
117116
}
118117

119118
@Override
120-
public SmithyBuilder<Partition> toBuilder() {
119+
public Builder toBuilder() {
121120
return new Builder(getSourceLocation())
122121
.id(id)
123122
.regionRegex(regionRegex)

smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/PartitionOutputs.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import software.amazon.smithy.model.node.ToNode;
1616
import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;
1717
import software.amazon.smithy.utils.ListUtils;
18-
import software.amazon.smithy.utils.SmithyBuilder;
1918
import software.amazon.smithy.utils.SmithyUnstableApi;
2019
import software.amazon.smithy.utils.ToSmithyBuilder;
2120

@@ -142,7 +141,7 @@ public SourceLocation getSourceLocation() {
142141
}
143142

144143
@Override
145-
public SmithyBuilder<PartitionOutputs> toBuilder() {
144+
public Builder toBuilder() {
146145
return new Builder(getSourceLocation())
147146
.name(name)
148147
.dnsSuffix(dnsSuffix)

smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/RegionOverride.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import software.amazon.smithy.model.node.Node;
1111
import software.amazon.smithy.model.node.ToNode;
1212
import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;
13-
import software.amazon.smithy.utils.SmithyBuilder;
1413
import software.amazon.smithy.utils.SmithyUnstableApi;
1514
import software.amazon.smithy.utils.ToSmithyBuilder;
1615

@@ -54,7 +53,7 @@ public SourceLocation getSourceLocation() {
5453
}
5554

5655
@Override
57-
public SmithyBuilder<RegionOverride> toBuilder() {
56+
public Builder toBuilder() {
5857
return new Builder(getSourceLocation());
5958
}
6059

smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionEndpointSpecialCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public Node toNode() {
8686
}
8787

8888
@Override
89-
public SmithyBuilder<PartitionEndpointSpecialCase> toBuilder() {
89+
public Builder toBuilder() {
9090
return new Builder()
9191
.endpoint(endpoint)
9292
.region(region)

smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionSpecialCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public Node toNode() {
7272
}
7373

7474
@Override
75-
public SmithyBuilder<PartitionSpecialCase> toBuilder() {
75+
public Builder toBuilder() {
7676
return new Builder()
7777
.dualStack(dualStack)
7878
.endpoint(endpoint)

smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/RegionSpecialCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public Node toNode() {
8383
}
8484

8585
@Override
86-
public SmithyBuilder<RegionSpecialCase> toBuilder() {
86+
public Builder toBuilder() {
8787
return new Builder()
8888
.dualStack(dualStack)
8989
.endpoint(endpoint)

smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardPartitionalEndpointsTrait.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import software.amazon.smithy.model.traits.AbstractTraitBuilder;
1818
import software.amazon.smithy.model.traits.Trait;
1919
import software.amazon.smithy.utils.BuilderRef;
20-
import software.amazon.smithy.utils.SmithyBuilder;
2120
import software.amazon.smithy.utils.ToSmithyBuilder;
2221

2322
/**
@@ -78,7 +77,7 @@ protected Node createNode() {
7877
}
7978

8079
@Override
81-
public SmithyBuilder<StandardPartitionalEndpointsTrait> toBuilder() {
80+
public Builder toBuilder() {
8281
return new Builder()
8382
.partitionEndpointSpecialCases(partitionEndpointSpecialCases)
8483
.endpointPatternType(endpointPatternType);

0 commit comments

Comments
 (0)