Return Builders instead of SmithyBuilders

kstich · kstich · commit 9514b4a70571 · 2024-10-31T11:28:45.000-07:00
This commit updates all instances where a generic SmithyBuilder&lt;&gt; 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.
diff --git a/smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java b/smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceTrait.java
@@ -25,7 +25,6 @@
 import software.amazon.smithy.model.traits.AbstractTraitBuilder;
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.utils.ListUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -75,7 +74,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<CfnResourceTrait> toBuilder() {
+    public Builder toBuilder() {
         return builder().sourceLocation(getSourceLocation()).name(name).additionalSchemas(additionalSchemas);
     }
 
diff --git a/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Handler.java b/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Handler.java
@@ -61,7 +61,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<Handler> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .permissions(permissions);
     }
diff --git a/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Property.java b/smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Property.java
@@ -62,7 +62,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<Property> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .insertionOrder(insertionOrder)
                 .dependencies(dependencies)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/Partition.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/Partition.java
@@ -16,7 +16,6 @@
 import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;
 import software.amazon.smithy.utils.BuilderRef;
 import software.amazon.smithy.utils.ListUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
@@ -117,7 +116,7 @@ public SourceLocation getSourceLocation() {
     }
 
     @Override
-    public SmithyBuilder<Partition> toBuilder() {
+    public Builder toBuilder() {
         return new Builder(getSourceLocation())
                 .id(id)
                 .regionRegex(regionRegex)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/PartitionOutputs.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/PartitionOutputs.java
@@ -15,7 +15,6 @@
 import software.amazon.smithy.model.node.ToNode;
 import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;
 import software.amazon.smithy.utils.ListUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
@@ -142,7 +141,7 @@ public SourceLocation getSourceLocation() {
     }
 
     @Override
-    public SmithyBuilder<PartitionOutputs> toBuilder() {
+    public Builder toBuilder() {
         return new Builder(getSourceLocation())
                 .name(name)
                 .dnsSuffix(dnsSuffix)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/RegionOverride.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/language/functions/partition/RegionOverride.java
@@ -10,7 +10,6 @@
 import software.amazon.smithy.model.node.Node;
 import software.amazon.smithy.model.node.ToNode;
 import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
@@ -54,7 +53,7 @@ public SourceLocation getSourceLocation() {
     }
 
     @Override
-    public SmithyBuilder<RegionOverride> toBuilder() {
+    public Builder toBuilder() {
         return new Builder(getSourceLocation());
     }
 
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionEndpointSpecialCase.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionEndpointSpecialCase.java
@@ -86,7 +86,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<PartitionEndpointSpecialCase> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
             .endpoint(endpoint)
             .region(region)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionSpecialCase.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/PartitionSpecialCase.java
@@ -72,7 +72,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<PartitionSpecialCase> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
             .dualStack(dualStack)
             .endpoint(endpoint)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/RegionSpecialCase.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/RegionSpecialCase.java
@@ -83,7 +83,7 @@ public Node toNode() {
     }
 
     @Override
-    public SmithyBuilder<RegionSpecialCase> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
             .dualStack(dualStack)
             .endpoint(endpoint)
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardPartitionalEndpointsTrait.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardPartitionalEndpointsTrait.java
@@ -17,7 +17,6 @@
 import software.amazon.smithy.model.traits.AbstractTraitBuilder;
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.utils.BuilderRef;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -78,7 +77,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<StandardPartitionalEndpointsTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
                 .partitionEndpointSpecialCases(partitionEndpointSpecialCases)
                 .endpointPatternType(endpointPatternType);
diff --git a/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardRegionalEndpointsTrait.java b/smithy-aws-endpoints/src/main/java/software/amazon/smithy/rulesengine/aws/traits/StandardRegionalEndpointsTrait.java
@@ -16,7 +16,6 @@
 import software.amazon.smithy.model.traits.AbstractTraitBuilder;
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.utils.BuilderRef;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -84,7 +83,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<StandardRegionalEndpointsTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
                 .partitionSpecialCases(partitionSpecialCases)
                 .regionSpecialCases(regionSpecialCases);
diff --git a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/HttpChecksumTrait.java b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/HttpChecksumTrait.java
@@ -27,7 +27,6 @@
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.utils.BuilderRef;
 import software.amazon.smithy.utils.ListUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
@@ -66,7 +65,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<HttpChecksumTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
                 .sourceLocation(getSourceLocation())
                 .requestChecksumRequired(requestChecksumRequired)
diff --git a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/clientendpointdiscovery/ClientDiscoveredEndpointTrait.java b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/clientendpointdiscovery/ClientDiscoveredEndpointTrait.java
@@ -20,7 +20,6 @@
 import software.amazon.smithy.model.shapes.ShapeId;
 import software.amazon.smithy.model.traits.AbstractTrait;
 import software.amazon.smithy.model.traits.AbstractTraitBuilder;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -63,7 +62,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<ClientDiscoveredEndpointTrait> toBuilder() {
+    public Builder toBuilder() {
         return builder().sourceLocation(getSourceLocation()).required(required);
     }
 
diff --git a/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/protocols/AwsQueryErrorTrait.java b/smithy-aws-traits/src/main/java/software/amazon/smithy/aws/traits/protocols/AwsQueryErrorTrait.java
@@ -74,7 +74,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<AwsQueryErrorTrait> toBuilder() {
+    public Builder toBuilder() {
         return builder().code(code).httpResponseCode(httpResponseCode).sourceLocation(getSourceLocation());
     }
 
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/node/ArrayNode.java b/smithy-model/src/main/java/software/amazon/smithy/model/node/ArrayNode.java
@@ -73,7 +73,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<ArrayNode> toBuilder() {
+    public Builder toBuilder() {
         return new Builder().sourceLocation(getSourceLocation()).merge(this);
     }
 
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/EnumValueTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/EnumValueTrait.java
@@ -21,7 +21,6 @@
 import software.amazon.smithy.model.node.NumberNode;
 import software.amazon.smithy.model.node.StringNode;
 import software.amazon.smithy.model.shapes.ShapeId;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -101,7 +100,7 @@ protected Node createNode() {
     }
 
     @Override
-    public SmithyBuilder<EnumValueTrait> toBuilder() {
+    public Builder toBuilder() {
         Builder builder = builder().sourceLocation(getSourceLocation());
         builder.value = value;
         return builder;
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/ExamplesTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/ExamplesTrait.java
@@ -310,7 +310,7 @@ public Node toNode() {
         }
 
         @Override
-        public SmithyBuilder<ErrorExample> toBuilder() {
+        public Builder toBuilder() {
             return builder().content(content).shapeId(shapeId);
         }
 
diff --git a/smithy-model/src/main/java/software/amazon/smithy/model/traits/RequestCompressionTrait.java b/smithy-model/src/main/java/software/amazon/smithy/model/traits/RequestCompressionTrait.java
@@ -23,7 +23,6 @@
 import software.amazon.smithy.model.shapes.ShapeId;
 import software.amazon.smithy.utils.BuilderRef;
 import software.amazon.smithy.utils.SetUtils;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -85,7 +84,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<RequestCompressionTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder()
                 .sourceLocation(getSourceLocation())
                 .encodings(encodings);
diff --git a/smithy-model/src/test/java/software/amazon/smithy/model/node/NodeMapperTest.java b/smithy-model/src/test/java/software/amazon/smithy/model/node/NodeMapperTest.java
@@ -1351,7 +1351,7 @@ protected Node createNode() {
         }
 
         @Override
-        public SmithyBuilder<SourceLocationBearerTrait> toBuilder() {
+        public Builder toBuilder() {
             return new Builder().sourceLocation(getSourceLocation());
         }
 
diff --git a/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/EndpointTestOperationInput.java b/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/EndpointTestOperationInput.java
@@ -79,7 +79,7 @@ public int hashCode() {
     }
 
     @Override
-    public SmithyBuilder<EndpointTestOperationInput> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .sourceLocation(sourceLocation)
                 .operationName(operationName)
diff --git a/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/ExpectedEndpoint.java b/smithy-rules-engine/src/main/java/software/amazon/smithy/rulesengine/traits/ExpectedEndpoint.java
@@ -56,7 +56,7 @@ public SourceLocation getSourceLocation() {
     }
 
     @Override
-    public SmithyBuilder<ExpectedEndpoint> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .sourceLocation(sourceLocation)
                 .url(url)
diff --git a/smithy-waiters/src/main/java/software/amazon/smithy/waiters/WaitableTrait.java b/smithy-waiters/src/main/java/software/amazon/smithy/waiters/WaitableTrait.java
@@ -24,7 +24,6 @@
 import software.amazon.smithy.model.traits.Trait;
 import software.amazon.smithy.model.traits.TraitService;
 import software.amazon.smithy.utils.BuilderRef;
-import software.amazon.smithy.utils.SmithyBuilder;
 import software.amazon.smithy.utils.ToSmithyBuilder;
 
 /**
@@ -47,7 +46,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<WaitableTrait> toBuilder() {
+    public Builder toBuilder() {
         return new Builder().sourceLocation(getSourceLocation()).replace(waiters);
     }
 
diff --git a/smithy-waiters/src/main/java/software/amazon/smithy/waiters/Waiter.java b/smithy-waiters/src/main/java/software/amazon/smithy/waiters/Waiter.java
@@ -69,7 +69,7 @@ public static Builder builder() {
     }
 
     @Override
-    public SmithyBuilder<Waiter> toBuilder() {
+    public Builder toBuilder() {
         return builder()
                 .documentation(getDocumentation().orElse(null))
                 .acceptors(getAcceptors())

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`import software.amazon.smithy.model.traits.AbstractTraitBuilder;`
`26`	`26`	`import software.amazon.smithy.model.traits.Trait;`
`27`	`27`	`import software.amazon.smithy.utils.ListUtils;`
`28`		`-import software.amazon.smithy.utils.SmithyBuilder;`
`29`	`28`	`import software.amazon.smithy.utils.ToSmithyBuilder;`
`30`	`29`
`31`	`30`	`/**`
`@@ -75,7 +74,7 @@ protected Node createNode() {`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`@Override`
`78`		`- public SmithyBuilder<CfnResourceTrait> toBuilder() {`
	`77`	`+ public Builder toBuilder() {`
`79`	`78`	`return builder().sourceLocation(getSourceLocation()).name(name).additionalSchemas(additionalSchemas);`
`80`	`79`	`}`
`81`	`80`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public Node toNode() {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Override`
`64`		`- public SmithyBuilder<Handler> toBuilder() {`
	`64`	`+ public Builder toBuilder() {`
`65`	`65`	`return builder()`
`66`	`66`	`.permissions(permissions);`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public Node toNode() {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
`65`		`- public SmithyBuilder<Property> toBuilder() {`
	`65`	`+ public Builder toBuilder() {`
`66`	`66`	`return builder()`
`67`	`67`	`.insertionOrder(insertionOrder)`
`68`	`68`	`.dependencies(dependencies)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`import software.amazon.smithy.model.node.Node;`
`11`	`11`	`import software.amazon.smithy.model.node.ToNode;`
`12`	`12`	`import software.amazon.smithy.rulesengine.language.RulesComponentBuilder;`
`13`		`-import software.amazon.smithy.utils.SmithyBuilder;`
`14`	`13`	`import software.amazon.smithy.utils.SmithyUnstableApi;`
`15`	`14`	`import software.amazon.smithy.utils.ToSmithyBuilder;`
`16`	`15`
`@@ -54,7 +53,7 @@ public SourceLocation getSourceLocation() {`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`@Override`
`57`		`- public SmithyBuilder<RegionOverride> toBuilder() {`
	`56`	`+ public Builder toBuilder() {`
`58`	`57`	`return new Builder(getSourceLocation());`
`59`	`58`	`}`
`60`	`59`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public Node toNode() {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`
`89`		`- public SmithyBuilder<PartitionEndpointSpecialCase> toBuilder() {`
	`89`	`+ public Builder toBuilder() {`
`90`	`90`	`return new Builder()`
`91`	`91`	`.endpoint(endpoint)`
`92`	`92`	`.region(region)`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public Node toNode() {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@Override`
`75`		`- public SmithyBuilder<PartitionSpecialCase> toBuilder() {`
	`75`	`+ public Builder toBuilder() {`
`76`	`76`	`return new Builder()`
`77`	`77`	`.dualStack(dualStack)`
`78`	`78`	`.endpoint(endpoint)`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public Node toNode() {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@Override`
`86`		`- public SmithyBuilder<RegionSpecialCase> toBuilder() {`
	`86`	`+ public Builder toBuilder() {`
`87`	`87`	`return new Builder()`
`88`	`88`	`.dualStack(dualStack)`
`89`	`89`	`.endpoint(endpoint)`