Skip to content

Update codegen fixture files and fix tests #6981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
S-Saranya1 wants to merge 6 commits into
base: feature/master/core-interceptors-migration
Choose a base branch
from
Open

Update codegen fixture files and fix tests #6981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25fc1ca
Update codegen fixture files
S-Saranya1 May 19, 2026
263fd5f
Fix test failure
S-Saranya1 May 20, 2026
1783c2d
Fix test failure
S-Saranya1 May 20, 2026
d20ca62
Fix test failures
S-Saranya1 May 20, 2026
65429c8
Fix checkstyle
S-Saranya1 May 20, 2026
57a38d2
Fix S3Express WireMock tests
S-Saranya1 May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...esources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1483,9 +1483,15 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
JsonAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(JsonAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of JsonAuthSchemeProvider");
JsonAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate
.isInstanceOf(JsonAuthSchemeProvider.class, p, "Expected an instance of JsonAuthSchemeProvider"))
.orElse(null);
JsonAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider : Validate
.isInstanceOf(JsonAuthSchemeProvider.class, clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of JsonAuthSchemeProvider");
JsonAuthSchemeParams.Builder paramsBuilder = JsonAuthSchemeParams.builder().operation(operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
List<AuthSchemeOption> options = authSchemeProvider.resolveAuthScheme(paramsBuilder.build());
Expand Down
12 changes: 9 additions & 3 deletions .../amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-async-client-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,15 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
QueryToJsonCompatibleAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(
QueryToJsonCompatibleAuthSchemeProvider.class, clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of QueryToJsonCompatibleAuthSchemeProvider");
QueryToJsonCompatibleAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate.isInstanceOf(QueryToJsonCompatibleAuthSchemeProvider.class, p,
"Expected an instance of QueryToJsonCompatibleAuthSchemeProvider")).orElse(null);
QueryToJsonCompatibleAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider
: Validate.isInstanceOf(QueryToJsonCompatibleAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of QueryToJsonCompatibleAuthSchemeProvider");
QueryToJsonCompatibleAuthSchemeParams.Builder paramsBuilder = QueryToJsonCompatibleAuthSchemeParams.builder().operation(
operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
Expand Down
12 changes: 9 additions & 3 deletions ...e/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-sync-client-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,15 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
QueryToJsonCompatibleAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(
QueryToJsonCompatibleAuthSchemeProvider.class, clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of QueryToJsonCompatibleAuthSchemeProvider");
QueryToJsonCompatibleAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate.isInstanceOf(QueryToJsonCompatibleAuthSchemeProvider.class, p,
"Expected an instance of QueryToJsonCompatibleAuthSchemeProvider")).orElse(null);
QueryToJsonCompatibleAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider
: Validate.isInstanceOf(QueryToJsonCompatibleAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of QueryToJsonCompatibleAuthSchemeProvider");
QueryToJsonCompatibleAuthSchemeParams.Builder paramsBuilder = QueryToJsonCompatibleAuthSchemeParams.builder().operation(
operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
Expand Down
12 changes: 9 additions & 3 deletions ...rc/test/resources/software/amazon/awssdk/codegen/poet/client/test-batchmanager-async.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,15 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
BatchManagerTestAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(BatchManagerTestAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of BatchManagerTestAuthSchemeProvider");
BatchManagerTestAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate.isInstanceOf(BatchManagerTestAuthSchemeProvider.class, p,
"Expected an instance of BatchManagerTestAuthSchemeProvider")).orElse(null);
BatchManagerTestAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider
: Validate.isInstanceOf(BatchManagerTestAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of BatchManagerTestAuthSchemeProvider");
BatchManagerTestAuthSchemeParams.Builder paramsBuilder = BatchManagerTestAuthSchemeParams.builder().operation(
operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
Expand Down
12 changes: 9 additions & 3 deletions ...st/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-async-client-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,9 +1487,15 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
JsonAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(JsonAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of JsonAuthSchemeProvider");
JsonAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate
.isInstanceOf(JsonAuthSchemeProvider.class, p, "Expected an instance of JsonAuthSchemeProvider"))
.orElse(null);
JsonAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider : Validate
.isInstanceOf(JsonAuthSchemeProvider.class, clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of JsonAuthSchemeProvider");
JsonAuthSchemeParams.Builder paramsBuilder = JsonAuthSchemeParams.builder().operation(operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
List<AuthSchemeOption> options = authSchemeProvider.resolveAuthScheme(paramsBuilder.build());
Expand Down
12 changes: 9 additions & 3 deletions ...src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-client-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,9 +983,15 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
JsonAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(JsonAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of JsonAuthSchemeProvider");
JsonAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate
.isInstanceOf(JsonAuthSchemeProvider.class, p, "Expected an instance of JsonAuthSchemeProvider"))
.orElse(null);
JsonAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider : Validate
.isInstanceOf(JsonAuthSchemeProvider.class, clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of JsonAuthSchemeProvider");
JsonAuthSchemeParams.Builder paramsBuilder = JsonAuthSchemeParams.builder().operation(operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
List<AuthSchemeOption> options = authSchemeProvider.resolveAuthScheme(paramsBuilder.build());
Expand Down
11 changes: 8 additions & 3 deletions ...tware/amazon/awssdk/codegen/poet/client/test-custom-context-params-sync-client-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,14 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
FooBarAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(FooBarAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of FooBarAuthSchemeProvider");
FooBarAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate.isInstanceOf(FooBarAuthSchemeProvider.class, p,
"Expected an instance of FooBarAuthSchemeProvider")).orElse(null);
FooBarAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider : Validate
.isInstanceOf(FooBarAuthSchemeProvider.class, clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of FooBarAuthSchemeProvider");
FooBarAuthSchemeParams.Builder paramsBuilder = FooBarAuthSchemeParams.builder().operation(operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
List<AuthSchemeOption> options = authSchemeProvider.resolveAuthScheme(paramsBuilder.build());
Expand Down
13 changes: 9 additions & 4 deletions ...c/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-async.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,15 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
ProtocolRestJsonWithCustomPackageAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(
ProtocolRestJsonWithCustomPackageAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of ProtocolRestJsonWithCustomPackageAuthSchemeProvider");
ProtocolRestJsonWithCustomPackageAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate.isInstanceOf(ProtocolRestJsonWithCustomPackageAuthSchemeProvider.class, p,
"Expected an instance of ProtocolRestJsonWithCustomPackageAuthSchemeProvider")).orElse(null);
ProtocolRestJsonWithCustomPackageAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider
: Validate.isInstanceOf(ProtocolRestJsonWithCustomPackageAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of ProtocolRestJsonWithCustomPackageAuthSchemeProvider");
ProtocolRestJsonWithCustomPackageAuthSchemeParams.Builder paramsBuilder = ProtocolRestJsonWithCustomPackageAuthSchemeParams
.builder().operation(operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
Expand Down
13 changes: 9 additions & 4 deletions ...rc/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-sync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,15 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
ProtocolRestJsonWithCustomPackageAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(
ProtocolRestJsonWithCustomPackageAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of ProtocolRestJsonWithCustomPackageAuthSchemeProvider");
ProtocolRestJsonWithCustomPackageAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate.isInstanceOf(ProtocolRestJsonWithCustomPackageAuthSchemeProvider.class, p,
"Expected an instance of ProtocolRestJsonWithCustomPackageAuthSchemeProvider")).orElse(null);
ProtocolRestJsonWithCustomPackageAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider
: Validate.isInstanceOf(ProtocolRestJsonWithCustomPackageAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of ProtocolRestJsonWithCustomPackageAuthSchemeProvider");
ProtocolRestJsonWithCustomPackageAuthSchemeParams.Builder paramsBuilder = ProtocolRestJsonWithCustomPackageAuthSchemeParams
.builder().operation(operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
Expand Down
13 changes: 9 additions & 4 deletions ...esources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-async.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,15 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat

private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
SdkClientConfiguration clientConfiguration) {
ProtocolRestJsonWithCustomContentTypeAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(
ProtocolRestJsonWithCustomContentTypeAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of ProtocolRestJsonWithCustomContentTypeAuthSchemeProvider");
ProtocolRestJsonWithCustomContentTypeAuthSchemeProvider requestAuthSchemeProvider = request
.overrideConfiguration()
.flatMap(c -> c.authSchemeProvider())
.map(p -> Validate.isInstanceOf(ProtocolRestJsonWithCustomContentTypeAuthSchemeProvider.class, p,
"Expected an instance of ProtocolRestJsonWithCustomContentTypeAuthSchemeProvider")).orElse(null);
ProtocolRestJsonWithCustomContentTypeAuthSchemeProvider authSchemeProvider = requestAuthSchemeProvider != null ? requestAuthSchemeProvider
: Validate.isInstanceOf(ProtocolRestJsonWithCustomContentTypeAuthSchemeProvider.class,
clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
"Expected an instance of ProtocolRestJsonWithCustomContentTypeAuthSchemeProvider");
ProtocolRestJsonWithCustomContentTypeAuthSchemeParams.Builder paramsBuilder = ProtocolRestJsonWithCustomContentTypeAuthSchemeParams
.builder().operation(operationName);
paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
Expand Down
Loading
Loading