Skip to content

Commit 7e7c124

Browse files
S-Saranya1S-Saranya1
committed
Updating tests
1 parent d065b95 commit 7e7c124

17 files changed

+411
-47
lines changed

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.squareup.javapoet.ParameterizedTypeName;
2323
import com.squareup.javapoet.TypeName;
2424
import com.squareup.javapoet.WildcardTypeName;
25-
import java.util.Map;
2625
import java.util.HashSet;
26+
import java.util.Map;
2727
import java.util.Optional;
2828
import java.util.Set;
2929
import java.util.concurrent.CompletableFuture;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public CompletableFuture<APostOperationResponse> aPostOperation(APostOperationRe
205205
operationMetadata, APostOperationResponse::builder);
206206
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
207207
switch (errorCode) {
208-
case "InvalidInputException":
208+
case "InvalidInput":
209209
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
210210
.exceptionBuilderSupplier(InvalidInputException::builder).build());
211211
default:
@@ -281,7 +281,7 @@ public CompletableFuture<APostOperationWithOutputResponse> aPostOperationWithOut
281281
operationMetadata, APostOperationWithOutputResponse::builder);
282282
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
283283
switch (errorCode) {
284-
case "InvalidInputException":
284+
case "InvalidInput":
285285
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
286286
.exceptionBuilderSupplier(InvalidInputException::builder).build());
287287
default:
@@ -798,7 +798,7 @@ public CompletableFuture<GetWithoutRequiredMembersResponse> getWithoutRequiredMe
798798
operationMetadata, GetWithoutRequiredMembersResponse::builder);
799799
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
800800
switch (errorCode) {
801-
case "InvalidInputException":
801+
case "InvalidInput":
802802
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
803803
.exceptionBuilderSupplier(InvalidInputException::builder).build());
804804
default:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio
142142
APostOperationResponse::builder);
143143
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
144144
switch (errorCode) {
145-
case "InvalidInputException":
145+
case "InvalidInput":
146146
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
147147
.exceptionBuilderSupplier(InvalidInputException::builder).build());
148148
default:
@@ -207,7 +207,7 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
207207
operationMetadata, APostOperationWithOutputResponse::builder);
208208
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
209209
switch (errorCode) {
210-
case "InvalidInputException":
210+
case "InvalidInput":
211211
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
212212
.exceptionBuilderSupplier(InvalidInputException::builder).build());
213213
default:
@@ -388,7 +388,7 @@ public GetWithoutRequiredMembersResponse getWithoutRequiredMembers(
388388
operationMetadata, GetWithoutRequiredMembersResponse::builder);
389389
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
390390
switch (errorCode) {
391-
case "InvalidInputException":
391+
case "InvalidInput":
392392
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
393393
.exceptionBuilderSupplier(InvalidInputException::builder).build());
394394
default:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public CompletableFuture<APostOperationResponse> aPostOperation(APostOperationRe
169169

170170
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
171171
switch (errorCode) {
172-
case "InvalidInputException":
172+
case "InvalidInput":
173173
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
174174
.exceptionBuilderSupplier(InvalidInputException::builder).build());
175175
default:
@@ -242,7 +242,7 @@ public CompletableFuture<APostOperationWithOutputResponse> aPostOperationWithOut
242242

243243
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
244244
switch (errorCode) {
245-
case "InvalidInputException":
245+
case "InvalidInput":
246246
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
247247
.exceptionBuilderSupplier(InvalidInputException::builder).build());
248248
default:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio
148148

149149
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
150150
switch (errorCode) {
151-
case "InvalidInputException":
151+
case "InvalidInput":
152152
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
153153
.exceptionBuilderSupplier(InvalidInputException::builder).build());
154154
default:
@@ -210,7 +210,7 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
210210

211211
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
212212
switch (errorCode) {
213-
case "InvalidInputException":
213+
case "InvalidInput":
214214
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
215215
.exceptionBuilderSupplier(InvalidInputException::builder).build());
216216
default:

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

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import software.amazon.awssdk.services.xml.model.EventStreamOperationResponseHandler;
6666
import software.amazon.awssdk.services.xml.model.GetOperationWithChecksumRequest;
6767
import software.amazon.awssdk.services.xml.model.GetOperationWithChecksumResponse;
68+
import software.amazon.awssdk.services.xml.model.InvalidInputException;
6869
import software.amazon.awssdk.services.xml.model.OperationWithChecksumRequiredRequest;
6970
import software.amazon.awssdk.services.xml.model.OperationWithChecksumRequiredResponse;
7071
import software.amazon.awssdk.services.xml.model.OperationWithNoneAuthTypeRequest;
@@ -158,6 +159,19 @@ public CompletableFuture<APostOperationResponse> aPostOperation(APostOperationRe
158159
HttpResponseHandler<Response<APostOperationResponse>> responseHandler = protocolFactory
159160
.createCombinedResponseHandler(APostOperationResponse::builder,
160161
new XmlOperationMetadata().withHasStreamingSuccessResponse(false));
162+
163+
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
164+
switch (errorCode) {
165+
case "InvalidInput":
166+
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
167+
.exceptionBuilderSupplier(InvalidInputException::builder).build());
168+
default:
169+
return Optional.empty();
170+
}
171+
};
172+
173+
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory
174+
.createErrorResponseHandler(exceptionMetadataMapper);
161175
String hostPrefix = "foo-";
162176
String resolvedHostExpression = "foo-";
163177

@@ -221,6 +235,19 @@ public CompletableFuture<APostOperationWithOutputResponse> aPostOperationWithOut
221235
.createCombinedResponseHandler(APostOperationWithOutputResponse::builder,
222236
new XmlOperationMetadata().withHasStreamingSuccessResponse(false));
223237

238+
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
239+
switch (errorCode) {
240+
case "InvalidInput":
241+
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
242+
.exceptionBuilderSupplier(InvalidInputException::builder).build());
243+
default:
244+
return Optional.empty();
245+
}
246+
};
247+
248+
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory
249+
.createErrorResponseHandler(exceptionMetadataMapper);
250+
224251
CompletableFuture<APostOperationWithOutputResponse> executeFuture = clientHandler
225252
.execute(new ClientExecutionParams<APostOperationWithOutputRequest, APostOperationWithOutputResponse>()
226253
.withOperationName("APostOperationWithOutput").withRequestConfiguration(clientConfiguration)
@@ -277,6 +304,16 @@ public CompletableFuture<BearerAuthOperationResponse> bearerAuthOperation(
277304
.createCombinedResponseHandler(BearerAuthOperationResponse::builder,
278305
new XmlOperationMetadata().withHasStreamingSuccessResponse(false));
279306

307+
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
308+
switch (errorCode) {
309+
default:
310+
return Optional.empty();
311+
}
312+
};
313+
314+
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory
315+
.createErrorResponseHandler(exceptionMetadataMapper);
316+
280317
CompletableFuture<BearerAuthOperationResponse> executeFuture = clientHandler
281318
.execute(new ClientExecutionParams<BearerAuthOperationRequest, BearerAuthOperationResponse>()
282319
.withOperationName("BearerAuthOperation").withRequestConfiguration(clientConfiguration)
@@ -331,14 +368,23 @@ public CompletableFuture<Void> eventStreamOperation(EventStreamOperationRequest
331368
HttpResponseHandler<EventStreamOperationResponse> responseHandler = protocolFactory.createResponseHandler(
332369
EventStreamOperationResponse::builder, XmlOperationMetadata.builder().hasStreamingSuccessResponse(true)
333370
.build());
334-
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory.createErrorResponseHandler();
335371
HttpResponseHandler<? extends EventStream> eventResponseHandler = protocolFactory.createResponseHandler(
336372
EventStreamTaggedUnionPojoSupplier.builder()
337373
.putSdkPojoSupplier("EventPayloadEvent", EventStream::eventPayloadEventBuilder)
338374
.putSdkPojoSupplier("NonEventPayloadEvent", EventStream::nonEventPayloadEventBuilder)
339375
.putSdkPojoSupplier("SecondEventPayloadEvent", EventStream::secondEventPayloadEventBuilder)
340376
.defaultSdkPojoSupplier(() -> new SdkPojoBuilder(EventStream.UNKNOWN)).build(), XmlOperationMetadata
341377
.builder().hasStreamingSuccessResponse(false).build());
378+
379+
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
380+
switch (errorCode) {
381+
default:
382+
return Optional.empty();
383+
}
384+
};
385+
386+
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory
387+
.createErrorResponseHandler(exceptionMetadataMapper);
342388
CompletableFuture<Void> eventStreamTransformFuture = new CompletableFuture<>();
343389
EventStreamAsyncResponseTransformer<EventStreamOperationResponse, EventStream> asyncResponseTransformer = EventStreamAsyncResponseTransformer
344390
.<EventStreamOperationResponse, EventStream> builder().eventStreamResponseHandler(asyncResponseHandler)
@@ -414,6 +460,16 @@ public CompletableFuture<GetOperationWithChecksumResponse> getOperationWithCheck
414460
.createCombinedResponseHandler(GetOperationWithChecksumResponse::builder,
415461
new XmlOperationMetadata().withHasStreamingSuccessResponse(false));
416462

463+
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
464+
switch (errorCode) {
465+
default:
466+
return Optional.empty();
467+
}
468+
};
469+
470+
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory
471+
.createErrorResponseHandler(exceptionMetadataMapper);
472+
417473
CompletableFuture<GetOperationWithChecksumResponse> executeFuture = clientHandler
418474
.execute(new ClientExecutionParams<GetOperationWithChecksumRequest, GetOperationWithChecksumResponse>()
419475
.withOperationName("GetOperationWithChecksum")
@@ -478,6 +534,16 @@ public CompletableFuture<OperationWithChecksumRequiredResponse> operationWithChe
478534
.createCombinedResponseHandler(OperationWithChecksumRequiredResponse::builder,
479535
new XmlOperationMetadata().withHasStreamingSuccessResponse(false));
480536

537+
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
538+
switch (errorCode) {
539+
default:
540+
return Optional.empty();
541+
}
542+
};
543+
544+
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory
545+
.createErrorResponseHandler(exceptionMetadataMapper);
546+
481547
CompletableFuture<OperationWithChecksumRequiredResponse> executeFuture = clientHandler
482548
.execute(new ClientExecutionParams<OperationWithChecksumRequiredRequest, OperationWithChecksumRequiredResponse>()
483549
.withOperationName("OperationWithChecksumRequired")
@@ -537,6 +603,16 @@ public CompletableFuture<OperationWithNoneAuthTypeResponse> operationWithNoneAut
537603
.createCombinedResponseHandler(OperationWithNoneAuthTypeResponse::builder,
538604
new XmlOperationMetadata().withHasStreamingSuccessResponse(false));
539605

606+
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
607+
switch (errorCode) {
608+
default:
609+
return Optional.empty();
610+
}
611+
};
612+
613+
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory
614+
.createErrorResponseHandler(exceptionMetadataMapper);
615+
540616
CompletableFuture<OperationWithNoneAuthTypeResponse> executeFuture = clientHandler
541617
.execute(new ClientExecutionParams<OperationWithNoneAuthTypeRequest, OperationWithNoneAuthTypeResponse>()
542618
.withOperationName("OperationWithNoneAuthType").withRequestConfiguration(clientConfiguration)
@@ -594,6 +670,16 @@ public CompletableFuture<OperationWithRequestCompressionResponse> operationWithR
594670
.createCombinedResponseHandler(OperationWithRequestCompressionResponse::builder,
595671
new XmlOperationMetadata().withHasStreamingSuccessResponse(false));
596672

673+
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
674+
switch (errorCode) {
675+
default:
676+
return Optional.empty();
677+
}
678+
};
679+
680+
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory
681+
.createErrorResponseHandler(exceptionMetadataMapper);
682+
597683
CompletableFuture<OperationWithRequestCompressionResponse> executeFuture = clientHandler
598684
.execute(new ClientExecutionParams<OperationWithRequestCompressionRequest, OperationWithRequestCompressionResponse>()
599685
.withOperationName("OperationWithRequestCompression")
@@ -772,6 +858,16 @@ public CompletableFuture<StreamingInputOperationResponse> streamingInputOperatio
772858
.createCombinedResponseHandler(StreamingInputOperationResponse::builder,
773859
new XmlOperationMetadata().withHasStreamingSuccessResponse(false));
774860

861+
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
862+
switch (errorCode) {
863+
default:
864+
return Optional.empty();
865+
}
866+
};
867+
868+
HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory
869+
.createErrorResponseHandler(exceptionMetadataMapper);
870+
775871
CompletableFuture<StreamingInputOperationResponse> executeFuture = clientHandler
776872
.execute(new ClientExecutionParams<StreamingInputOperationRequest, StreamingInputOperationResponse>()
777873
.withOperationName("StreamingInputOperation")

0 commit comments

Comments
 (0)