Skip to content

Commit 7545bd2

Browse files
S-Saranya1S-Saranya1
authored
Update codegen fixture files (#6922)
1 parent 8af4695 commit 7545bd2

38 files changed

Lines changed: 2577 additions & 528 deletions

File tree

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-bearer-auth-client-builder-class.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@
3232
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
3333
import software.amazon.awssdk.retries.api.RetryStrategy;
3434
import software.amazon.awssdk.services.json.auth.scheme.JsonAuthSchemeProvider;
35-
import software.amazon.awssdk.services.json.auth.scheme.internal.JsonAuthSchemeInterceptor;
3635
import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
37-
import software.amazon.awssdk.services.json.endpoints.internal.JsonRequestSetEndpointInterceptor;
38-
import software.amazon.awssdk.services.json.endpoints.internal.JsonResolveEndpointInterceptor;
3936
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
4037
import software.amazon.awssdk.utils.CollectionUtils;
4138
import software.amazon.awssdk.utils.Validate;
@@ -74,9 +71,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
7471
@Override
7572
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
7673
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
77-
endpointInterceptors.add(new JsonAuthSchemeInterceptor());
78-
endpointInterceptors.add(new JsonResolveEndpointInterceptor());
79-
endpointInterceptors.add(new JsonRequestSetEndpointInterceptor());
8074
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
8175
List<ExecutionInterceptor> interceptors = interceptorFactory
8276
.getInterceptors("software/amazon/awssdk/services/json/execution.interceptors");

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,8 @@
4141
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
4242
import software.amazon.awssdk.retries.api.RetryStrategy;
4343
import software.amazon.awssdk.services.json.auth.scheme.JsonAuthSchemeProvider;
44-
import software.amazon.awssdk.services.json.auth.scheme.internal.JsonAuthSchemeInterceptor;
4544
import software.amazon.awssdk.services.json.endpoints.JsonClientContextParams;
4645
import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
47-
import software.amazon.awssdk.services.json.endpoints.internal.JsonRequestSetEndpointInterceptor;
48-
import software.amazon.awssdk.services.json.endpoints.internal.JsonResolveEndpointInterceptor;
4946
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
5047
import software.amazon.awssdk.utils.AttributeMap;
5148
import software.amazon.awssdk.utils.CollectionUtils;
@@ -86,9 +83,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
8683
@Override
8784
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
8885
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
89-
endpointInterceptors.add(new JsonAuthSchemeInterceptor());
90-
endpointInterceptors.add(new JsonResolveEndpointInterceptor());
91-
endpointInterceptors.add(new JsonRequestSetEndpointInterceptor());
9286
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
9387
List<ExecutionInterceptor> interceptors = interceptorFactory
9488
.getInterceptors("software/amazon/awssdk/services/json/execution.interceptors");

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-endpoints-auth-params.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,8 @@
4040
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
4141
import software.amazon.awssdk.retries.api.RetryStrategy;
4242
import software.amazon.awssdk.services.query.auth.scheme.QueryAuthSchemeProvider;
43-
import software.amazon.awssdk.services.query.auth.scheme.internal.QueryAuthSchemeInterceptor;
4443
import software.amazon.awssdk.services.query.endpoints.QueryClientContextParams;
4544
import software.amazon.awssdk.services.query.endpoints.QueryEndpointProvider;
46-
import software.amazon.awssdk.services.query.endpoints.internal.QueryRequestSetEndpointInterceptor;
47-
import software.amazon.awssdk.services.query.endpoints.internal.QueryResolveEndpointInterceptor;
4845
import software.amazon.awssdk.services.query.internal.QueryServiceClientConfigurationBuilder;
4946
import software.amazon.awssdk.utils.CollectionUtils;
5047
import software.amazon.awssdk.utils.Validate;
@@ -83,9 +80,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
8380
@Override
8481
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
8582
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
86-
endpointInterceptors.add(new QueryAuthSchemeInterceptor());
87-
endpointInterceptors.add(new QueryResolveEndpointInterceptor());
88-
endpointInterceptors.add(new QueryRequestSetEndpointInterceptor());
8983
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
9084
List<ExecutionInterceptor> interceptors = interceptorFactory
9185
.getInterceptors("software/amazon/awssdk/services/query/execution.interceptors");

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-internal-defaults-class.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@
2929
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
3030
import software.amazon.awssdk.retries.api.RetryStrategy;
3131
import software.amazon.awssdk.services.json.auth.scheme.JsonAuthSchemeProvider;
32-
import software.amazon.awssdk.services.json.auth.scheme.internal.JsonAuthSchemeInterceptor;
3332
import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
34-
import software.amazon.awssdk.services.json.endpoints.internal.JsonRequestSetEndpointInterceptor;
35-
import software.amazon.awssdk.services.json.endpoints.internal.JsonResolveEndpointInterceptor;
3633
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
3734
import software.amazon.awssdk.utils.CollectionUtils;
3835

@@ -75,9 +72,6 @@ protected final SdkClientConfiguration mergeInternalDefaults(SdkClientConfigurat
7572
@Override
7673
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
7774
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
78-
endpointInterceptors.add(new JsonAuthSchemeInterceptor());
79-
endpointInterceptors.add(new JsonResolveEndpointInterceptor());
80-
endpointInterceptors.add(new JsonRequestSetEndpointInterceptor());
8175
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
8276
List<ExecutionInterceptor> interceptors = interceptorFactory
8377
.getInterceptors("software/amazon/awssdk/services/json/execution.interceptors");

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-composed-sync-default-client-builder.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@
3737
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
3838
import software.amazon.awssdk.retries.api.RetryStrategy;
3939
import software.amazon.awssdk.services.json.auth.scheme.JsonAuthSchemeProvider;
40-
import software.amazon.awssdk.services.json.auth.scheme.internal.JsonAuthSchemeInterceptor;
4140
import software.amazon.awssdk.services.json.endpoints.JsonClientContextParams;
4241
import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
43-
import software.amazon.awssdk.services.json.endpoints.internal.JsonRequestSetEndpointInterceptor;
44-
import software.amazon.awssdk.services.json.endpoints.internal.JsonResolveEndpointInterceptor;
4542
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
4643
import software.amazon.awssdk.utils.CollectionUtils;
4744
import software.amazon.awssdk.utils.Validate;
@@ -81,9 +78,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
8178
@Override
8279
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
8380
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
84-
endpointInterceptors.add(new JsonAuthSchemeInterceptor());
85-
endpointInterceptors.add(new JsonResolveEndpointInterceptor());
86-
endpointInterceptors.add(new JsonRequestSetEndpointInterceptor());
8781
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
8882
List<ExecutionInterceptor> interceptors = interceptorFactory
8983
.getInterceptors("software/amazon/awssdk/services/json/execution.interceptors");

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-env-bearer-token-client-builder-class.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@
3636
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
3737
import software.amazon.awssdk.retries.api.RetryStrategy;
3838
import software.amazon.awssdk.services.json.auth.scheme.JsonAuthSchemeProvider;
39-
import software.amazon.awssdk.services.json.auth.scheme.internal.JsonAuthSchemeInterceptor;
4039
import software.amazon.awssdk.services.json.endpoints.JsonEndpointProvider;
41-
import software.amazon.awssdk.services.json.endpoints.internal.JsonRequestSetEndpointInterceptor;
42-
import software.amazon.awssdk.services.json.endpoints.internal.JsonResolveEndpointInterceptor;
4340
import software.amazon.awssdk.services.json.internal.EnvironmentTokenSystemSettings;
4441
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
4542
import software.amazon.awssdk.utils.CollectionUtils;
@@ -91,9 +88,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
9188
@Override
9289
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
9390
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
94-
endpointInterceptors.add(new JsonAuthSchemeInterceptor());
95-
endpointInterceptors.add(new JsonResolveEndpointInterceptor());
96-
endpointInterceptors.add(new JsonRequestSetEndpointInterceptor());
9791
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
9892
List<ExecutionInterceptor> interceptors = interceptorFactory
9993
.getInterceptors("software/amazon/awssdk/services/json/execution.interceptors");

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-h2-service-client-builder-class.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@
3232
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
3333
import software.amazon.awssdk.retries.api.RetryStrategy;
3434
import software.amazon.awssdk.services.h2.auth.scheme.H2AuthSchemeProvider;
35-
import software.amazon.awssdk.services.h2.auth.scheme.internal.H2AuthSchemeInterceptor;
3635
import software.amazon.awssdk.services.h2.endpoints.H2EndpointProvider;
37-
import software.amazon.awssdk.services.h2.endpoints.internal.H2RequestSetEndpointInterceptor;
38-
import software.amazon.awssdk.services.h2.endpoints.internal.H2ResolveEndpointInterceptor;
3936
import software.amazon.awssdk.services.h2.internal.H2ServiceClientConfigurationBuilder;
4037
import software.amazon.awssdk.utils.AttributeMap;
4138
import software.amazon.awssdk.utils.CollectionUtils;
@@ -71,9 +68,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
7168
@Override
7269
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
7370
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
74-
endpointInterceptors.add(new H2AuthSchemeInterceptor());
75-
endpointInterceptors.add(new H2ResolveEndpointInterceptor());
76-
endpointInterceptors.add(new H2RequestSetEndpointInterceptor());
7771
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
7872
List<ExecutionInterceptor> interceptors = interceptorFactory
7973
.getInterceptors("software/amazon/awssdk/services/h2/execution.interceptors");

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-multi-auth-sigv4a-client-builder-class.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@
3131
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
3232
import software.amazon.awssdk.retries.api.RetryStrategy;
3333
import software.amazon.awssdk.services.database.auth.scheme.DatabaseAuthSchemeProvider;
34-
import software.amazon.awssdk.services.database.auth.scheme.internal.DatabaseAuthSchemeInterceptor;
3534
import software.amazon.awssdk.services.database.endpoints.DatabaseEndpointProvider;
36-
import software.amazon.awssdk.services.database.endpoints.internal.DatabaseRequestSetEndpointInterceptor;
37-
import software.amazon.awssdk.services.database.endpoints.internal.DatabaseResolveEndpointInterceptor;
3835
import software.amazon.awssdk.services.database.internal.DatabaseServiceClientConfigurationBuilder;
3936
import software.amazon.awssdk.utils.CollectionUtils;
4037

@@ -70,9 +67,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
7067
@Override
7168
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
7269
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
73-
endpointInterceptors.add(new DatabaseAuthSchemeInterceptor());
74-
endpointInterceptors.add(new DatabaseResolveEndpointInterceptor());
75-
endpointInterceptors.add(new DatabaseRequestSetEndpointInterceptor());
7670
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
7771
List<ExecutionInterceptor> interceptors = interceptorFactory
7872
.getInterceptors("software/amazon/awssdk/services/database/execution.interceptors");

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-no-auth-ops-client-builder-class.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@
3333
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
3434
import software.amazon.awssdk.retries.api.RetryStrategy;
3535
import software.amazon.awssdk.services.database.auth.scheme.DatabaseAuthSchemeProvider;
36-
import software.amazon.awssdk.services.database.auth.scheme.internal.DatabaseAuthSchemeInterceptor;
3736
import software.amazon.awssdk.services.database.endpoints.DatabaseEndpointProvider;
38-
import software.amazon.awssdk.services.database.endpoints.internal.DatabaseRequestSetEndpointInterceptor;
39-
import software.amazon.awssdk.services.database.endpoints.internal.DatabaseResolveEndpointInterceptor;
4037
import software.amazon.awssdk.services.database.internal.DatabaseServiceClientConfigurationBuilder;
4138
import software.amazon.awssdk.utils.CollectionUtils;
4239
import software.amazon.awssdk.utils.Validate;
@@ -76,9 +73,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
7673
@Override
7774
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
7875
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
79-
endpointInterceptors.add(new DatabaseAuthSchemeInterceptor());
80-
endpointInterceptors.add(new DatabaseResolveEndpointInterceptor());
81-
endpointInterceptors.add(new DatabaseRequestSetEndpointInterceptor());
8276
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
8377
List<ExecutionInterceptor> interceptors = interceptorFactory
8478
.getInterceptors("software/amazon/awssdk/services/database/execution.interceptors");

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-no-auth-service-client-builder-class.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@
2727
import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
2828
import software.amazon.awssdk.retries.api.RetryStrategy;
2929
import software.amazon.awssdk.services.database.auth.scheme.DatabaseAuthSchemeProvider;
30-
import software.amazon.awssdk.services.database.auth.scheme.internal.DatabaseAuthSchemeInterceptor;
3130
import software.amazon.awssdk.services.database.endpoints.DatabaseEndpointProvider;
32-
import software.amazon.awssdk.services.database.endpoints.internal.DatabaseRequestSetEndpointInterceptor;
33-
import software.amazon.awssdk.services.database.endpoints.internal.DatabaseResolveEndpointInterceptor;
3431
import software.amazon.awssdk.services.database.internal.DatabaseServiceClientConfigurationBuilder;
3532
import software.amazon.awssdk.utils.CollectionUtils;
3633

@@ -66,9 +63,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
6663
@Override
6764
protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
6865
List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
69-
endpointInterceptors.add(new DatabaseAuthSchemeInterceptor());
70-
endpointInterceptors.add(new DatabaseResolveEndpointInterceptor());
71-
endpointInterceptors.add(new DatabaseRequestSetEndpointInterceptor());
7266
ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
7367
List<ExecutionInterceptor> interceptors = interceptorFactory
7468
.getInterceptors("software/amazon/awssdk/services/database/execution.interceptors");

0 commit comments

Comments
 (0)