Skip to content

Commit d217303

Browse files
RanVakninRanVaknin
committed
Fix fixture files
1 parent 921711c commit d217303

13 files changed

+698
-672
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
4444
import software.amazon.awssdk.retries.api.RetryStrategy;
4545
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
46+
import software.amazon.awssdk.services.json.internal.ServiceVersionUserAgent;
4647
import software.amazon.awssdk.services.json.model.APostOperationRequest;
4748
import software.amazon.awssdk.services.json.model.APostOperationResponse;
4849
import software.amazon.awssdk.services.json.model.APostOperationWithOutputRequest;
@@ -108,7 +109,8 @@ final class DefaultJsonClient implements JsonClient {
108109

109110
protected DefaultJsonClient(SdkClientConfiguration clientConfiguration) {
110111
this.clientHandler = new AwsSyncClientHandler(clientConfiguration);
111-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
112+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
113+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
112114
this.protocolFactory = init(AwsJsonProtocolFactory.builder()).build();
113115
}
114116

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import software.amazon.awssdk.protocols.query.AwsQueryProtocolFactory;
4040
import software.amazon.awssdk.retries.api.RetryStrategy;
4141
import software.amazon.awssdk.services.query.internal.QueryServiceClientConfigurationBuilder;
42+
import software.amazon.awssdk.services.query.internal.ServiceVersionUserAgent;
4243
import software.amazon.awssdk.services.query.model.APostOperationRequest;
4344
import software.amazon.awssdk.services.query.model.APostOperationResponse;
4445
import software.amazon.awssdk.services.query.model.APostOperationWithOutputRequest;
@@ -113,7 +114,8 @@ final class DefaultQueryClient implements QueryClient {
113114

114115
protected DefaultQueryClient(SdkClientConfiguration clientConfiguration) {
115116
this.clientHandler = new AwsSyncClientHandler(clientConfiguration);
116-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
117+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
118+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
117119
this.protocolFactory = init();
118120
}
119121

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import software.amazon.awssdk.protocols.xml.AwsXmlProtocolFactory;
4040
import software.amazon.awssdk.protocols.xml.XmlOperationMetadata;
4141
import software.amazon.awssdk.retries.api.RetryStrategy;
42+
import software.amazon.awssdk.services.xml.internal.ServiceVersionUserAgent;
4243
import software.amazon.awssdk.services.xml.internal.XmlServiceClientConfigurationBuilder;
4344
import software.amazon.awssdk.services.xml.model.APostOperationRequest;
4445
import software.amazon.awssdk.services.xml.model.APostOperationResponse;
@@ -95,7 +96,8 @@ final class DefaultXmlClient implements XmlClient {
9596

9697
protected DefaultXmlClient(SdkClientConfiguration clientConfiguration) {
9798
this.clientHandler = new AwsSyncClientHandler(clientConfiguration);
98-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
99+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
100+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
99101
this.protocolFactory = init();
100102
}
101103

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-sync-client-class.java‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
3535
import software.amazon.awssdk.retries.api.RetryStrategy;
3636
import software.amazon.awssdk.services.querytojsoncompatible.internal.QueryToJsonCompatibleServiceClientConfigurationBuilder;
37+
import software.amazon.awssdk.services.querytojsoncompatible.internal.ServiceVersionUserAgent;
3738
import software.amazon.awssdk.services.querytojsoncompatible.model.APostOperationRequest;
3839
import software.amazon.awssdk.services.querytojsoncompatible.model.APostOperationResponse;
3940
import software.amazon.awssdk.services.querytojsoncompatible.model.InvalidInputException;
@@ -53,7 +54,7 @@ final class DefaultQueryToJsonCompatibleClient implements QueryToJsonCompatibleC
5354
private static final Logger log = Logger.loggerFor(DefaultQueryToJsonCompatibleClient.class);
5455

5556
private static final AwsProtocolMetadata protocolMetadata = AwsProtocolMetadata.builder()
56-
.serviceProtocol(AwsServiceProtocol.AWS_JSON).build();
57+
.serviceProtocol(AwsServiceProtocol.AWS_JSON).build();
5758

5859
private final SyncClientHandler clientHandler;
5960

@@ -63,7 +64,8 @@ final class DefaultQueryToJsonCompatibleClient implements QueryToJsonCompatibleC
6364

6465
protected DefaultQueryToJsonCompatibleClient(SdkClientConfiguration clientConfiguration) {
6566
this.clientHandler = new AwsSyncClientHandler(clientConfiguration);
66-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
67+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
68+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
6769
this.protocolFactory = init(AwsJsonProtocolFactory.builder()).build();
6870
}
6971

@@ -89,45 +91,45 @@ protected DefaultQueryToJsonCompatibleClient(SdkClientConfiguration clientConfig
8991
*/
9092
@Override
9193
public APostOperationResponse aPostOperation(APostOperationRequest aPostOperationRequest) throws InvalidInputException,
92-
AwsServiceException, SdkClientException, QueryToJsonCompatibleException {
94+
AwsServiceException, SdkClientException, QueryToJsonCompatibleException {
9395
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
94-
.isPayloadJson(true).build();
96+
.isPayloadJson(true).build();
9597

9698
HttpResponseHandler<APostOperationResponse> responseHandler = protocolFactory.createResponseHandler(operationMetadata,
97-
APostOperationResponse::builder);
99+
APostOperationResponse::builder);
98100
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
99101
if (errorCode == null) {
100102
return Optional.empty();
101103
}
102104
switch (errorCode) {
103-
case "InvalidInput":
104-
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
105-
.exceptionBuilderSupplier(InvalidInputException::builder).build());
106-
default:
107-
return Optional.empty();
105+
case "InvalidInput":
106+
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
107+
.exceptionBuilderSupplier(InvalidInputException::builder).build());
108+
default:
109+
return Optional.empty();
108110
}
109111
};
110112
HttpResponseHandler<AwsServiceException> errorResponseHandler = createErrorResponseHandler(protocolFactory,
111-
operationMetadata, exceptionMetadataMapper);
113+
operationMetadata, exceptionMetadataMapper);
112114
SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(aPostOperationRequest, this.clientConfiguration);
113115
List<MetricPublisher> metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest
114-
.overrideConfiguration().orElse(null));
116+
.overrideConfiguration().orElse(null));
115117
MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector
116-
.create("ApiCall");
118+
.create("ApiCall");
117119
try {
118120
apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "QueryToJsonCompatibleService");
119121
apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperation");
120122
String hostPrefix = "{StringMember}-foo.";
121123
HostnameValidator.validateHostnameCompliant(aPostOperationRequest.stringMember(), "StringMember",
122-
"aPostOperationRequest");
124+
"aPostOperationRequest");
123125
String resolvedHostExpression = String.format("%s-foo.", aPostOperationRequest.stringMember());
124126

125127
return clientHandler.execute(new ClientExecutionParams<APostOperationRequest, APostOperationResponse>()
126-
.withOperationName("APostOperation").withProtocolMetadata(protocolMetadata)
127-
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
128-
.hostPrefixExpression(resolvedHostExpression).withRequestConfiguration(clientConfiguration)
129-
.withInput(aPostOperationRequest).withMetricCollector(apiCallMetricCollector)
130-
.withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
128+
.withOperationName("APostOperation").withProtocolMetadata(protocolMetadata)
129+
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
130+
.hostPrefixExpression(resolvedHostExpression).withRequestConfiguration(clientConfiguration)
131+
.withInput(aPostOperationRequest).withMetricCollector(apiCallMetricCollector)
132+
.withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
131133
} finally {
132134
metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
133135
}
@@ -139,7 +141,7 @@ public final String serviceName() {
139141
}
140142

141143
private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfiguration clientConfiguration,
142-
RequestOverrideConfiguration requestOverrideConfiguration) {
144+
RequestOverrideConfiguration requestOverrideConfiguration) {
143145
List<MetricPublisher> publishers = null;
144146
if (requestOverrideConfiguration != null) {
145147
publishers = requestOverrideConfiguration.metricPublishers();
@@ -154,7 +156,7 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat
154156
}
155157

156158
private HttpResponseHandler<AwsServiceException> createErrorResponseHandler(BaseAwsJsonProtocolFactory protocolFactory,
157-
JsonOperationMetadata operationMetadata, Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper) {
159+
JsonOperationMetadata operationMetadata, Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper) {
158160
return protocolFactory.createErrorResponseHandler(operationMetadata, exceptionMetadataMapper);
159161
}
160162

@@ -188,7 +190,7 @@ private SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request,
188190
return configuration.build();
189191
}
190192
QueryToJsonCompatibleServiceClientConfigurationBuilder serviceConfigBuilder = new QueryToJsonCompatibleServiceClientConfigurationBuilder(
191-
configuration);
193+
configuration);
192194
for (SdkPlugin plugin : plugins) {
193195
plugin.configureClient(serviceConfigBuilder);
194196
}
@@ -198,8 +200,8 @@ private SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request,
198200

199201
private <T extends BaseAwsJsonProtocolFactory.Builder<T>> T init(T builder) {
200202
return builder.clientConfiguration(clientConfiguration)
201-
.defaultServiceExceptionSupplier(QueryToJsonCompatibleException::builder).protocol(AwsJsonProtocol.AWS_JSON)
202-
.protocolVersion("1.1").hasAwsQueryCompatible(true);
203+
.defaultServiceExceptionSupplier(QueryToJsonCompatibleException::builder).protocol(AwsJsonProtocol.AWS_JSON)
204+
.protocolVersion("1.1").hasAwsQueryCompatible(true);
203205
}
204206

205207
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
4141
import software.amazon.awssdk.retries.api.RetryStrategy;
4242
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
43+
import software.amazon.awssdk.services.json.internal.ServiceVersionUserAgent;
4344
import software.amazon.awssdk.services.json.model.APostOperationRequest;
4445
import software.amazon.awssdk.services.json.model.APostOperationResponse;
4546
import software.amazon.awssdk.services.json.model.APostOperationWithOutputRequest;
@@ -100,7 +101,8 @@ final class DefaultJsonClient implements JsonClient {
100101

101102
protected DefaultJsonClient(SdkClientConfiguration clientConfiguration) {
102103
this.clientHandler = new AwsSyncClientHandler(clientConfiguration);
103-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
104+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
105+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
104106
this.protocolFactory = init(AwsCborProtocolFactory.builder()).build();
105107
}
106108

0 commit comments

Comments
 (0)