Skip to content

Commit 84fc081

Browse files
committed
chore: switch to use function supplier in runtime client plugin
1 parent cce6231 commit 84fc081

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsAuthPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin.Convention.HAS_MIDDLEWARE;
2222

2323
import java.util.Collections;
24+
import java.util.HashMap;
2425
import java.util.List;
2526
import java.util.Map;
2627
import java.util.Set;
@@ -104,7 +105,9 @@ && isAwsService(s)
104105
RuntimeClientPlugin.builder()
105106
.withConventions(AwsDependency.STS_MIDDLEWARE.dependency,
106107
"StsAuth", HAS_CONFIG)
107-
.additionalResolveFunctionParameters("STSClient")
108+
.resolveFunctionParamsSupplier((m, s, o) -> new HashMap<String, Object>() {{
109+
put("STSClient", "STSClient");
110+
}})
108111
.servicePredicate((m, s) -> testServiceId(s, "STS"))
109112
.build(),
110113
RuntimeClientPlugin.builder()

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddEndpointDiscoveryPlugin.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package software.amazon.smithy.aws.typescript.codegen;
1717

1818
import java.util.Collections;
19+
import java.util.HashMap;
1920
import java.util.List;
2021
import java.util.Map;
2122
import java.util.function.Consumer;
@@ -68,21 +69,29 @@ public List<RuntimeClientPlugin> getClientPlugins() {
6869
.withConventions(AwsDependency.MIDDLEWARE_ENDPOINT_DISCOVERY.dependency,
6970
"EndpointDiscovery", RuntimeClientPlugin.Convention.HAS_CONFIG)
7071
// ToDo: The Endpoint Discovery Command Name needs to be read from ClientEndpointDiscoveryTrait.
71-
.additionalResolveFunctionParameters("DescribeEndpointsCommand")
72+
.resolveFunctionParamsSupplier((m, s, o) -> new HashMap<String, Object>() {{
73+
put("DescribeEndpointsCommand", "DescribeEndpointsCommand");
74+
}})
7275
.servicePredicate((m, s) -> hasClientEndpointDiscovery(s))
7376
.build(),
7477
// ToDo: The value ClientDiscoveredEndpointTrait.isRequired() needs to be passed to Plugin instead
7578
// of creating two functions Required and Optional. The map of identifiers also needs to be passed.
7679
RuntimeClientPlugin.builder()
7780
.withConventions(AwsDependency.MIDDLEWARE_ENDPOINT_DISCOVERY.dependency,
7881
"EndpointDiscoveryRequired", RuntimeClientPlugin.Convention.HAS_MIDDLEWARE)
79-
.additionalPluginFunctionParameters(new String[]{"clientStack", "options"})
82+
.pluginFunctionParamsSupplier((m, s, o) -> new HashMap<String, Object>() {{
83+
put("clientStack", "clientStack");
84+
put("options", "options");
85+
}})
8086
.operationPredicate((m, s, o) -> isClientDiscoveredEndpointRequired(s, o))
8187
.build(),
8288
RuntimeClientPlugin.builder()
8389
.withConventions(AwsDependency.MIDDLEWARE_ENDPOINT_DISCOVERY.dependency,
8490
"EndpointDiscoveryOptional", RuntimeClientPlugin.Convention.HAS_MIDDLEWARE)
85-
.additionalPluginFunctionParameters(new String[]{"clientStack", "options"})
91+
.pluginFunctionParamsSupplier((m, s, o) -> new HashMap<String, Object>() {{
92+
put("clientStack", "clientStack");
93+
put("options", "options");
94+
}})
8695
.operationPredicate((m, s, o) -> isClientDiscoveredEndpointOptional(s, o))
8796
.build()
8897
);

0 commit comments

Comments
 (0)