Skip to content

Commit 1e12de3

Browse files
RanVakninRanVaknin
committed
Fix more fixture files
1 parent d217303 commit 1e12de3

17 files changed

+750
-716
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
5959
import software.amazon.awssdk.retries.api.RetryStrategy;
6060
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
61+
import software.amazon.awssdk.services.json.internal.ServiceVersionUserAgent;
6162
import software.amazon.awssdk.services.json.model.APostOperationRequest;
6263
import software.amazon.awssdk.services.json.model.APostOperationResponse;
6364
import software.amazon.awssdk.services.json.model.APostOperationWithOutputRequest;
@@ -140,7 +141,8 @@ final class DefaultJsonAsyncClient implements JsonAsyncClient {
140141

141142
protected DefaultJsonAsyncClient(SdkClientConfiguration clientConfiguration) {
142143
this.clientHandler = new AwsAsyncClientHandler(clientConfiguration);
143-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
144+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
145+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
144146
this.protocolFactory = init(AwsJsonProtocolFactory.builder()).build();
145147
this.executor = clientConfiguration.option(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR);
146148
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
6060
import software.amazon.awssdk.retries.api.RetryStrategy;
6161
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
62+
import software.amazon.awssdk.services.json.internal.ServiceVersionUserAgent;
6263
import software.amazon.awssdk.services.json.model.APostOperationRequest;
6364
import software.amazon.awssdk.services.json.model.APostOperationResponse;
6465
import software.amazon.awssdk.services.json.model.APostOperationWithOutputRequest;
@@ -143,7 +144,8 @@ final class DefaultJsonAsyncClient implements JsonAsyncClient {
143144

144145
protected DefaultJsonAsyncClient(SdkClientConfiguration clientConfiguration) {
145146
this.clientHandler = new AwsAsyncClientHandler(clientConfiguration);
146-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
147+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
148+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
147149
this.protocolFactory = init(AwsCborProtocolFactory.builder()).build();
148150
this.jsonProtocolFactory = init(AwsJsonProtocolFactory.builder()).build();
149151
this.executor = clientConfiguration.option(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
import software.amazon.awssdk.retries.api.RetryStrategy;
6565
import software.amazon.awssdk.services.json.batchmanager.JsonAsyncBatchManager;
6666
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
67+
import software.amazon.awssdk.services.json.internal.ServiceVersionUserAgent;
6768
import software.amazon.awssdk.services.json.model.APostOperationRequest;
6869
import software.amazon.awssdk.services.json.model.APostOperationResponse;
6970
import software.amazon.awssdk.services.json.model.APostOperationWithOutputRequest;
@@ -153,7 +154,8 @@ final class DefaultJsonAsyncClient implements JsonAsyncClient {
153154

154155
protected DefaultJsonAsyncClient(SdkClientConfiguration clientConfiguration) {
155156
this.clientHandler = new AwsAsyncClientHandler(clientConfiguration);
156-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
157+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
158+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
157159
this.protocolFactory = init(AwsJsonProtocolFactory.builder()).build();
158160
this.executor = clientConfiguration.option(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR);
159161
this.executorService = clientConfiguration.option(SdkClientOption.SCHEDULED_EXECUTOR_SERVICE);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import software.amazon.awssdk.protocols.query.AwsQueryProtocolFactory;
4646
import software.amazon.awssdk.retries.api.RetryStrategy;
4747
import software.amazon.awssdk.services.query.internal.QueryServiceClientConfigurationBuilder;
48+
import software.amazon.awssdk.services.query.internal.ServiceVersionUserAgent;
4849
import software.amazon.awssdk.services.query.model.APostOperationRequest;
4950
import software.amazon.awssdk.services.query.model.APostOperationResponse;
5051
import software.amazon.awssdk.services.query.model.APostOperationWithOutputRequest;
@@ -122,7 +123,8 @@ final class DefaultQueryAsyncClient implements QueryAsyncClient {
122123

123124
protected DefaultQueryAsyncClient(SdkClientConfiguration clientConfiguration) {
124125
this.clientHandler = new AwsAsyncClientHandler(clientConfiguration);
125-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
126+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
127+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
126128
this.protocolFactory = init();
127129
this.executorService = clientConfiguration.option(SdkClientOption.SCHEDULED_EXECUTOR_SERVICE);
128130
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import software.amazon.awssdk.protocols.xml.AwsXmlProtocolFactory;
5151
import software.amazon.awssdk.protocols.xml.XmlOperationMetadata;
5252
import software.amazon.awssdk.retries.api.RetryStrategy;
53+
import software.amazon.awssdk.services.xml.internal.ServiceVersionUserAgent;
5354
import software.amazon.awssdk.services.xml.internal.XmlServiceClientConfigurationBuilder;
5455
import software.amazon.awssdk.services.xml.model.APostOperationRequest;
5556
import software.amazon.awssdk.services.xml.model.APostOperationResponse;
@@ -114,7 +115,8 @@ final class DefaultXmlAsyncClient implements XmlAsyncClient {
114115

115116
protected DefaultXmlAsyncClient(SdkClientConfiguration clientConfiguration) {
116117
this.clientHandler = new AwsAsyncClientHandler(clientConfiguration);
117-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
118+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
119+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
118120
this.protocolFactory = init();
119121
this.executor = clientConfiguration.option(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR);
120122
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
6464
import software.amazon.awssdk.retries.api.RetryStrategy;
6565
import software.amazon.awssdk.services.json.internal.JsonServiceClientConfigurationBuilder;
66+
import software.amazon.awssdk.services.json.internal.ServiceVersionUserAgent;
6667
import software.amazon.awssdk.services.json.model.APostOperationRequest;
6768
import software.amazon.awssdk.services.json.model.APostOperationResponse;
6869
import software.amazon.awssdk.services.json.model.APostOperationWithOutputRequest;
@@ -146,7 +147,8 @@ final class DefaultJsonAsyncClient implements JsonAsyncClient {
146147

147148
protected DefaultJsonAsyncClient(SdkClientConfiguration clientConfiguration) {
148149
this.clientHandler = new AwsAsyncClientHandler(clientConfiguration);
149-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
150+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
151+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
150152
this.protocolFactory = init(AwsJsonProtocolFactory.builder()).build();
151153
this.executor = clientConfiguration.option(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR);
152154
}

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
3939
import software.amazon.awssdk.retries.api.RetryStrategy;
4040
import software.amazon.awssdk.services.querytojsoncompatible.internal.QueryToJsonCompatibleServiceClientConfigurationBuilder;
41+
import software.amazon.awssdk.services.querytojsoncompatible.internal.ServiceVersionUserAgent;
4142
import software.amazon.awssdk.services.querytojsoncompatible.model.APostOperationRequest;
4243
import software.amazon.awssdk.services.querytojsoncompatible.model.APostOperationResponse;
4344
import software.amazon.awssdk.services.querytojsoncompatible.model.InvalidInputException;
@@ -57,7 +58,7 @@ final class DefaultQueryToJsonCompatibleAsyncClient implements QueryToJsonCompat
5758
private static final Logger log = LoggerFactory.getLogger(DefaultQueryToJsonCompatibleAsyncClient.class);
5859

5960
private static final AwsProtocolMetadata protocolMetadata = AwsProtocolMetadata.builder()
60-
.serviceProtocol(AwsServiceProtocol.AWS_JSON).build();
61+
.serviceProtocol(AwsServiceProtocol.AWS_JSON).build();
6162

6263
private final AsyncClientHandler clientHandler;
6364

@@ -67,7 +68,8 @@ final class DefaultQueryToJsonCompatibleAsyncClient implements QueryToJsonCompat
6768

6869
protected DefaultQueryToJsonCompatibleAsyncClient(SdkClientConfiguration clientConfiguration) {
6970
this.clientHandler = new AwsAsyncClientHandler(clientConfiguration);
70-
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this).build();
71+
this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
72+
.option(SdkClientOption.API_METADATA, ServiceVersionUserAgent.USER_AGENT).build();
7173
this.protocolFactory = init(AwsJsonProtocolFactory.builder()).build();
7274
}
7375

@@ -99,43 +101,43 @@ protected DefaultQueryToJsonCompatibleAsyncClient(SdkClientConfiguration clientC
99101
public CompletableFuture<APostOperationResponse> aPostOperation(APostOperationRequest aPostOperationRequest) {
100102
SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(aPostOperationRequest, this.clientConfiguration);
101103
List<MetricPublisher> metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest
102-
.overrideConfiguration().orElse(null));
104+
.overrideConfiguration().orElse(null));
103105
MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector
104-
.create("ApiCall");
106+
.create("ApiCall");
105107
try {
106108
apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "QueryToJsonCompatibleService");
107109
apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperation");
108110
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
109-
.isPayloadJson(true).build();
111+
.isPayloadJson(true).build();
110112

111113
HttpResponseHandler<APostOperationResponse> responseHandler = protocolFactory.createResponseHandler(
112-
operationMetadata, APostOperationResponse::builder);
114+
operationMetadata, APostOperationResponse::builder);
113115
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
114116
if (errorCode == null) {
115117
return Optional.empty();
116118
}
117119
switch (errorCode) {
118-
case "InvalidInput":
119-
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
120-
.exceptionBuilderSupplier(InvalidInputException::builder).build());
121-
default:
122-
return Optional.empty();
120+
case "InvalidInput":
121+
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
122+
.exceptionBuilderSupplier(InvalidInputException::builder).build());
123+
default:
124+
return Optional.empty();
123125
}
124126
};
125127
HttpResponseHandler<AwsServiceException> errorResponseHandler = createErrorResponseHandler(protocolFactory,
126-
operationMetadata, exceptionMetadataMapper);
128+
operationMetadata, exceptionMetadataMapper);
127129
String hostPrefix = "{StringMember}-foo.";
128130
HostnameValidator.validateHostnameCompliant(aPostOperationRequest.stringMember(), "StringMember",
129-
"aPostOperationRequest");
131+
"aPostOperationRequest");
130132
String resolvedHostExpression = String.format("%s-foo.", aPostOperationRequest.stringMember());
131133

132134
CompletableFuture<APostOperationResponse> executeFuture = clientHandler
133-
.execute(new ClientExecutionParams<APostOperationRequest, APostOperationResponse>()
134-
.withOperationName("APostOperation").withProtocolMetadata(protocolMetadata)
135-
.withMarshaller(new APostOperationRequestMarshaller(protocolFactory))
136-
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
137-
.withRequestConfiguration(clientConfiguration).withMetricCollector(apiCallMetricCollector)
138-
.hostPrefixExpression(resolvedHostExpression).withInput(aPostOperationRequest));
135+
.execute(new ClientExecutionParams<APostOperationRequest, APostOperationResponse>()
136+
.withOperationName("APostOperation").withProtocolMetadata(protocolMetadata)
137+
.withMarshaller(new APostOperationRequestMarshaller(protocolFactory))
138+
.withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
139+
.withRequestConfiguration(clientConfiguration).withMetricCollector(apiCallMetricCollector)
140+
.hostPrefixExpression(resolvedHostExpression).withInput(aPostOperationRequest));
139141
CompletableFuture<APostOperationResponse> whenCompleted = executeFuture.whenComplete((r, e) -> {
140142
metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
141143
});
@@ -159,12 +161,12 @@ public final String serviceName() {
159161

160162
private <T extends BaseAwsJsonProtocolFactory.Builder<T>> T init(T builder) {
161163
return builder.clientConfiguration(clientConfiguration)
162-
.defaultServiceExceptionSupplier(QueryToJsonCompatibleException::builder).protocol(AwsJsonProtocol.AWS_JSON)
163-
.protocolVersion("1.1").hasAwsQueryCompatible(true);
164+
.defaultServiceExceptionSupplier(QueryToJsonCompatibleException::builder).protocol(AwsJsonProtocol.AWS_JSON)
165+
.protocolVersion("1.1").hasAwsQueryCompatible(true);
164166
}
165167

166168
private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfiguration clientConfiguration,
167-
RequestOverrideConfiguration requestOverrideConfiguration) {
169+
RequestOverrideConfiguration requestOverrideConfiguration) {
168170
List<MetricPublisher> publishers = null;
169171
if (requestOverrideConfiguration != null) {
170172
publishers = requestOverrideConfiguration.metricPublishers();
@@ -208,7 +210,7 @@ private SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request,
208210
return configuration.build();
209211
}
210212
QueryToJsonCompatibleServiceClientConfigurationBuilder serviceConfigBuilder = new QueryToJsonCompatibleServiceClientConfigurationBuilder(
211-
configuration);
213+
configuration);
212214
for (SdkPlugin plugin : plugins) {
213215
plugin.configureClient(serviceConfigBuilder);
214216
}
@@ -217,7 +219,7 @@ private SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request,
217219
}
218220

219221
private HttpResponseHandler<AwsServiceException> createErrorResponseHandler(BaseAwsJsonProtocolFactory protocolFactory,
220-
JsonOperationMetadata operationMetadata, Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper) {
222+
JsonOperationMetadata operationMetadata, Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper) {
221223
return protocolFactory.createErrorResponseHandler(operationMetadata, exceptionMetadataMapper);
222224
}
223225

0 commit comments

Comments
 (0)