diff --git a/.changes/next-release/bugfix-AWSSDKforJavav2-4f61398.json b/.changes/next-release/bugfix-AWSSDKforJavav2-4f61398.json new file mode 100644 index 000000000000..4d4283f6b507 --- /dev/null +++ b/.changes/next-release/bugfix-AWSSDKforJavav2-4f61398.json @@ -0,0 +1,6 @@ +{ + "type": "bugfix", + "category": "AWS SDK for Java v2", + "contributor": "", + "description": "Reduce generated client source and bytecode size for JSON, CBOR, and Smithy RPC v2 protocol services by generating the error-metadata mapper once per client instead of once per operation." +} diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java index a5108cb099d7..0525694513f4 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java @@ -152,6 +152,8 @@ protected void addFields(Builder type) { .addField(protocolSpec.protocolFactory(model)) .addField(SdkClientConfiguration.class, "clientConfiguration", PRIVATE, FINAL); + protocolSpec.errorResponseMapperField().ifPresent(type::addField); + // Kinesis doesn't support CBOR for STS yet so need another protocol factory for JSON if (model.getMetadata().isCborProtocol()) { type.addField(AwsJsonProtocolFactory.class, "jsonProtocolFactory", PRIVATE, FINAL); diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java index 14c2d89faad2..af0529666219 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java @@ -129,6 +129,7 @@ protected void addFields(TypeSpec.Builder type) { .addField(SyncClientHandler.class, "clientHandler", PRIVATE, FINAL) .addField(protocolSpec.protocolFactory(model)) .addField(SdkClientConfiguration.class, "clientConfiguration", PRIVATE, FINAL); + protocolSpec.errorResponseMapperField().ifPresent(type::addField); } @Override diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java index a697a166292d..879a71d1ad66 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java @@ -168,39 +168,48 @@ public Optional errorResponseHandler(OperationModel opModel) { String protocolFactory = protocolFactoryLiteral(model, opModel); CodeBlock.Builder builder = CodeBlock.builder(); + builder.add("\n$T<$T> errorResponseHandler = createErrorResponseHandler($L, operationMetadata, " + + "exceptionMetadataMapper);", + HttpResponseHandler.class, AwsServiceException.class, protocolFactory); + + return Optional.of(builder.build()); + } + + @Override + public Optional errorResponseMapperField() { ParameterizedTypeName metadataMapperType = ParameterizedTypeName.get( ClassName.get(Function.class), ClassName.get(String.class), ParameterizedTypeName.get(Optional.class, ExceptionMetadata.class)); - builder.add("\n$T exceptionMetadataMapper = errorCode -> {\n", metadataMapperType); - builder.add("if (errorCode == null) {\n"); - builder.add("return $T.empty();\n", Optional.class); - builder.add("}\n"); - builder.add("switch (errorCode) {\n"); + CodeBlock.Builder initializer = CodeBlock.builder(); + initializer.add("errorCode -> {\n"); + initializer.add("if (errorCode == null) {\n"); + initializer.add("return $T.empty();\n", Optional.class); + initializer.add("}\n"); + initializer.add("switch (errorCode) {\n"); model.getShapes().values().stream() .filter(shape -> shape.getShapeType() == ShapeType.Exception) .forEach(exceptionShape -> { - String exceptionName = exceptionShape.getShapeName(); String errorCode = exceptionShape.getErrorCode(); - builder.add("case $S:\n", errorCode); - builder.add("return $T.of($T.builder()\n", Optional.class, ExceptionMetadata.class) - .add(".errorCode($S)\n", errorCode); - builder.add(populateHttpStatusCode(exceptionShape, model)); - builder.add(".exceptionBuilderSupplier($T::builder)\n", - poetExtensions.getModelClassFromShape(exceptionShape)) - .add(".build());\n"); + initializer.add("case $S:\n", errorCode); + initializer.add("return $T.of($T.builder()\n", Optional.class, ExceptionMetadata.class) + .add(".errorCode($S)\n", errorCode); + initializer.add(populateHttpStatusCode(exceptionShape, model)); + initializer.add(".exceptionBuilderSupplier($T::builder)\n", + poetExtensions.getModelClassFromShape(exceptionShape)) + .add(".build());\n"); }); - builder.add("default: return $T.empty();\n", Optional.class); - builder.add("}\n"); - builder.add("};\n"); - - builder.add("$T<$T> errorResponseHandler = createErrorResponseHandler($L, operationMetadata, exceptionMetadataMapper);", - HttpResponseHandler.class, AwsServiceException.class, protocolFactory); + initializer.add("default: return $T.empty();\n", Optional.class); + initializer.add("}\n"); + initializer.add("}"); - return Optional.of(builder.build()); + return Optional.of(FieldSpec.builder(metadataMapperType, "exceptionMetadataMapper", + Modifier.PRIVATE, Modifier.FINAL) + .initializer(initializer.build()) + .build()); } @Override diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java index d2d41f8169c5..ac85a59ca859 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java @@ -70,6 +70,15 @@ default Optional createEventstreamErrorResponseHandler() { return Optional.empty(); } + /** + * The per-client field holding the non-streaming {@code exceptionMetadataMapper}, when the protocol emits one. The + * mapper switches over the whole model's exceptions and is identical for every operation, so it is generated once as + * a client field instead of once per operation body. + */ + default Optional errorResponseMapperField() { + return Optional.empty(); + } + default List additionalMethods() { return new ArrayList<>(); } diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/ClientLambdaCallSiteCeilingTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/ClientLambdaCallSiteCeilingTest.java index 3f978863fc00..c457fd266243 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/ClientLambdaCallSiteCeilingTest.java +++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/ClientLambdaCallSiteCeilingTest.java @@ -41,25 +41,22 @@ public class ClientLambdaCallSiteCeilingTest { * fixture's count by its operation count, which is at least 4 for every fixture listed here, so the headroom absorbs * a couple of new shared per-client lambdas without absorbing a per-operation one. Single-operation fixtures are * excluded for that reason: no headroom smaller than one operation exists. - * - *

The JSON, CBOR and Smithy RPC v2 fixtures are legitimately higher than the rest because those protocols emit a - * per-operation {@code exceptionMetadataMapper} lambda whose body switches over that operation's error codes. */ private static Stream ceilings() { return Stream.of( - Arguments.of("test-json-async-client-class.java", 44), - Arguments.of("test-json-client-class.java", 18), - Arguments.of("test-aws-json-async-client-class.java", 38), - Arguments.of("test-cbor-async-client-class.java", 38), - Arguments.of("test-cbor-client-class.java", 16), - Arguments.of("test-rpcv2-async-client-class.java", 19), - Arguments.of("test-rpcv2-sync.java", 18), + Arguments.of("test-json-async-client-class.java", 29), + Arguments.of("test-json-client-class.java", 6), + Arguments.of("test-aws-json-async-client-class.java", 25), + Arguments.of("test-cbor-async-client-class.java", 25), + Arguments.of("test-cbor-client-class.java", 6), + Arguments.of("test-rpcv2-async-client-class.java", 7), + Arguments.of("test-rpcv2-sync.java", 6), Arguments.of("test-query-async-client-class.java", 14), Arguments.of("test-query-client-class.java", 5), Arguments.of("test-xml-async-client-class.java", 18), Arguments.of("test-xml-client-class.java", 5), - Arguments.of("test-unsigned-payload-trait-async-client-class.java", 17), - Arguments.of("test-unsigned-payload-trait-sync-client-class.java", 16) + Arguments.of("test-unsigned-payload-trait-async-client-class.java", 7), + Arguments.of("test-unsigned-payload-trait-sync-client-class.java", 6) ); } diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java index 644cab0a3340..1d4e46dd67fb 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-json-async-client-class.java @@ -155,6 +155,22 @@ final class DefaultJsonAsyncClient implements JsonAsyncClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInputException": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + case "ServiceFaultException": + return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) + .exceptionBuilderSupplier(ServiceFaultException::builder).build()); + default: + return Optional.empty(); + } + }; + private final Executor executor; protected DefaultJsonAsyncClient(SdkClientConfiguration clientConfiguration) { @@ -209,21 +225,6 @@ public CompletableFuture aPostOperation(APostOperationRe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); String hostPrefix = "{StringMember}-foo."; @@ -291,21 +292,6 @@ public CompletableFuture aPostOperationWithOut HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationWithOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -386,21 +372,6 @@ public CompletableFuture eventStreamOperation(EventStreamOperationRequest HttpResponseHandler errorEventResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, eventstreamExceptionMetadataMapper); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); EventStreamTaggedUnionJsonMarshaller eventMarshaller = EventStreamTaggedUnionJsonMarshaller.builder() @@ -485,21 +456,6 @@ public CompletableFuture eventStreamO HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, EventStreamOperationWithOnlyInputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); EventStreamTaggedUnionJsonMarshaller eventMarshaller = EventStreamTaggedUnionJsonMarshaller.builder() @@ -593,21 +549,6 @@ public CompletableFuture eventStreamOperationWithOnlyOutput( HttpResponseHandler errorEventResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, eventstreamExceptionMetadataMapper); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); CompletableFuture future = new CompletableFuture<>(); @@ -690,21 +631,6 @@ public CompletableFuture getWithoutRequiredMe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GetWithoutRequiredMembersResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -764,21 +690,6 @@ public CompletableFuture operationWithChe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithChecksumRequiredResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -841,21 +752,6 @@ public CompletableFuture operationWithNoneAut HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithNoneAuthTypeResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -915,21 +811,6 @@ public CompletableFuture operationWithR HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithRequestCompressionResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -994,21 +875,6 @@ public CompletableFuture paginatedOpera HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, PaginatedOperationWithResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1071,21 +937,6 @@ public CompletableFuture paginatedOp HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1152,21 +1003,6 @@ public CompletableFuture streamingInputOperatio HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1244,21 +1080,6 @@ public CompletableFuture streamingInputOutputOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1348,21 +1169,6 @@ public CompletableFuture streamingOutputOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-async-client-class.java index 4e0f538494c8..e050a9abab4e 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-async-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-async-client-class.java @@ -84,6 +84,19 @@ final class DefaultQueryToJsonCompatibleAsyncClient implements QueryToJsonCompat private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInputException": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + default: + return Optional.empty(); + } + }; + protected DefaultQueryToJsonCompatibleAsyncClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsAsyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -130,18 +143,6 @@ public CompletableFuture aPostOperation(APostOperationRe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); String hostPrefix = "{StringMember}-foo."; diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-sync-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-sync-client-class.java index 39c951532e8c..4bf12d2d6d22 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-sync-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-aws-query-compatible-json-sync-client-class.java @@ -79,6 +79,19 @@ final class DefaultQueryToJsonCompatibleClient implements QueryToJsonCompatibleC private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInputException": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + default: + return Optional.empty(); + } + }; + protected DefaultQueryToJsonCompatibleClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsSyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -114,18 +127,6 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, APostOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(aPostOperationRequest, this.clientConfiguration); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-batchmanager-async.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-batchmanager-async.java index 6c7c3ac09f62..d502d9d8e359 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-batchmanager-async.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-batchmanager-async.java @@ -84,6 +84,16 @@ final class DefaultBatchManagerTestAsyncClient implements BatchManagerTestAsyncC private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + default: + return Optional.empty(); + } + }; + private final ScheduledExecutorService executorService; protected DefaultBatchManagerTestAsyncClient(SdkClientConfiguration clientConfiguration) { @@ -129,15 +139,6 @@ public CompletableFuture sendRequest(SendRequestRequest sen HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, SendRequestResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-async-client-class.java index 2d7f62c157d1..21731fc695f0 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-async-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-async-client-class.java @@ -156,6 +156,22 @@ final class DefaultJsonAsyncClient implements JsonAsyncClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInputException": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + case "ServiceFaultException": + return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) + .exceptionBuilderSupplier(ServiceFaultException::builder).build()); + default: + return Optional.empty(); + } + }; + private final AwsJsonProtocolFactory jsonProtocolFactory; private final Executor executor; @@ -213,21 +229,6 @@ public CompletableFuture aPostOperation(APostOperationRe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); String hostPrefix = "{StringMember}-foo."; @@ -295,21 +296,6 @@ public CompletableFuture aPostOperationWithOut HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationWithOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -390,21 +376,6 @@ public CompletableFuture eventStreamOperation(EventStreamOperationRequest HttpResponseHandler errorEventResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, eventstreamExceptionMetadataMapper); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); EventStreamTaggedUnionJsonMarshaller eventMarshaller = EventStreamTaggedUnionJsonMarshaller.builder() @@ -489,21 +460,6 @@ public CompletableFuture eventStreamO HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, EventStreamOperationWithOnlyInputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); EventStreamTaggedUnionJsonMarshaller eventMarshaller = EventStreamTaggedUnionJsonMarshaller.builder() @@ -597,21 +553,6 @@ public CompletableFuture eventStreamOperationWithOnlyOutput( HttpResponseHandler errorEventResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, eventstreamExceptionMetadataMapper); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); CompletableFuture future = new CompletableFuture<>(); @@ -694,21 +635,6 @@ public CompletableFuture getWithoutRequiredMe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GetWithoutRequiredMembersResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -768,21 +694,6 @@ public CompletableFuture operationWithChe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithChecksumRequiredResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -845,21 +756,6 @@ public CompletableFuture operationWithNoneAut HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithNoneAuthTypeResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -919,21 +815,6 @@ public CompletableFuture operationWithR HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithRequestCompressionResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -998,21 +879,6 @@ public CompletableFuture paginatedOpera HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, PaginatedOperationWithResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1075,21 +941,6 @@ public CompletableFuture paginatedOp HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1156,21 +1007,6 @@ public CompletableFuture streamingInputOperatio HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1248,21 +1084,6 @@ public CompletableFuture streamingInputOutputOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1352,21 +1173,6 @@ public CompletableFuture streamingOutputOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-client-class.java index 26c881f78875..9ff973b70180 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-cbor-client-class.java @@ -115,6 +115,22 @@ final class DefaultJsonClient implements JsonClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInputException": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + case "ServiceFaultException": + return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) + .exceptionBuilderSupplier(ServiceFaultException::builder).build()); + default: + return Optional.empty(); + } + }; + protected DefaultJsonClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsSyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -150,21 +166,6 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, APostOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(aPostOperationRequest, this.clientConfiguration); @@ -222,21 +223,6 @@ public APostOperationWithOutputResponse aPostOperationWithOutput( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationWithOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(aPostOperationWithOutputRequest, @@ -291,21 +277,6 @@ public GetWithoutRequiredMembersResponse getWithoutRequiredMembers( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GetWithoutRequiredMembersResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(getWithoutRequiredMembersRequest, @@ -356,21 +327,6 @@ public OperationWithChecksumRequiredResponse operationWithChecksumRequired( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithChecksumRequiredResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(operationWithChecksumRequiredRequest, @@ -427,21 +383,6 @@ public OperationWithNoneAuthTypeResponse operationWithNoneAuthType( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithNoneAuthTypeResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(operationWithNoneAuthTypeRequest, @@ -492,21 +433,6 @@ public OperationWithRequestCompressionResponse operationWithRequestCompression( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithRequestCompressionResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(operationWithRequestCompressionRequest, @@ -563,21 +489,6 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, PaginatedOperationWithResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(paginatedOperationWithResultKeyRequest, @@ -628,21 +539,6 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(paginatedOperationWithoutResultKeyRequest, @@ -703,21 +599,6 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(streamingInputOperationRequest, @@ -795,21 +676,6 @@ public ReturnT streamingInputOutputOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(streamingInputOutputOperationRequest, @@ -878,21 +744,6 @@ public ReturnT streamingOutputOperation(StreamingOutputOperationReques HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - case "ServiceFaultException": - return Optional.of(ExceptionMetadata.builder().errorCode("ServiceFaultException").httpStatusCode(500) - .exceptionBuilderSupplier(ServiceFaultException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(streamingOutputOperationRequest, diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-async-client-class.java index 709afbe403d9..d47ca63513ba 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-async-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-async-client-class.java @@ -85,6 +85,16 @@ final class DefaultFooBarAsyncClient implements FooBarAsyncClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + default: + return Optional.empty(); + } + }; + protected DefaultFooBarAsyncClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsAsyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -130,15 +140,6 @@ public CompletableFuture getDatabaseVersion(GetDatab HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GetDatabaseVersionResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-sync-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-sync-client-class.java index 8d36e6a44ea3..5b357c23c042 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-sync-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-sync-client-class.java @@ -80,6 +80,16 @@ final class DefaultFooBarClient implements FooBarClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + default: + return Optional.empty(); + } + }; + protected DefaultFooBarClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsSyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -113,15 +123,6 @@ public GetDatabaseVersionResponse getDatabaseVersion(GetDatabaseVersionRequest g HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GetDatabaseVersionResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(getDatabaseVersionRequest, diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-async.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-async.java index 95f1d7a9bf98..90abd9e720bc 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-async.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-async.java @@ -82,6 +82,16 @@ final class DefaultProtocolRestJsonWithCustomPackageAsyncClient implements Proto private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + default: + return Optional.empty(); + } + }; + protected DefaultProtocolRestJsonWithCustomPackageAsyncClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsAsyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration @@ -127,15 +137,6 @@ public CompletableFuture oneOperation(OneOperationRequest HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, OneOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-sync.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-sync.java index d15a1d556135..51b1e35f934c 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-sync.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custompackage-sync.java @@ -77,6 +77,16 @@ final class DefaultProtocolRestJsonWithCustomPackageClient implements ProtocolRe private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + default: + return Optional.empty(); + } + }; + protected DefaultProtocolRestJsonWithCustomPackageClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsSyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration @@ -111,15 +121,6 @@ public OneOperationResponse oneOperation(OneOperationRequest oneOperationRequest HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, OneOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(oneOperationRequest, this.clientConfiguration); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-async.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-async.java index 5216c6b42d2b..55fb3230f5d4 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-async.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-async.java @@ -82,6 +82,16 @@ final class DefaultProtocolRestJsonWithCustomContentTypeAsyncClient implements P private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + default: + return Optional.empty(); + } + }; + protected DefaultProtocolRestJsonWithCustomContentTypeAsyncClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsAsyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration @@ -127,15 +137,6 @@ public CompletableFuture oneOperation(OneOperationRequest HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, OneOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-sync.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-sync.java index 5c24993d272e..2d85e1a94838 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-sync.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-customservicemetadata-sync.java @@ -77,6 +77,16 @@ final class DefaultProtocolRestJsonWithCustomContentTypeClient implements Protoc private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + default: + return Optional.empty(); + } + }; + protected DefaultProtocolRestJsonWithCustomContentTypeClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsSyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration @@ -111,15 +121,6 @@ public OneOperationResponse oneOperation(OneOperationRequest oneOperationRequest HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, OneOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(oneOperationRequest, this.clientConfiguration); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java index 679b83c46c75..83e264696992 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java @@ -97,6 +97,16 @@ final class DefaultEndpointDiscoveryTestAsyncClient implements EndpointDiscovery private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + default: + return Optional.empty(); + } + }; + private EndpointDiscoveryRefreshCache endpointDiscoveryCache; protected DefaultEndpointDiscoveryTestAsyncClient(SdkClientConfiguration clientConfiguration) { @@ -144,15 +154,6 @@ public CompletableFuture describeEndpoints(DescribeEn HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, DescribeEndpointsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -209,15 +210,6 @@ public CompletableFuture testDiscovery HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, TestDiscoveryIdentifiersRequiredResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); @@ -303,15 +295,6 @@ public CompletableFuture testDiscoveryOptional( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, TestDiscoveryOptionalResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); @@ -388,15 +371,6 @@ public CompletableFuture testDiscoveryRequired( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, TestDiscoveryRequiredResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java index 05a4e96f4657..a4089f26d762 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java @@ -94,6 +94,16 @@ final class DefaultEndpointDiscoveryTestClient implements EndpointDiscoveryTestC private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + default: + return Optional.empty(); + } + }; + private EndpointDiscoveryRefreshCache endpointDiscoveryCache; protected DefaultEndpointDiscoveryTestClient(SdkClientConfiguration clientConfiguration) { @@ -129,15 +139,6 @@ public DescribeEndpointsResponse describeEndpoints(DescribeEndpointsRequest desc HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, DescribeEndpointsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(describeEndpointsRequest, @@ -185,15 +186,6 @@ public TestDiscoveryIdentifiersRequiredResponse testDiscoveryIdentifiersRequired HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, TestDiscoveryIdentifiersRequiredResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); @@ -263,15 +255,6 @@ public TestDiscoveryOptionalResponse testDiscoveryOptional(TestDiscoveryOptional HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, TestDiscoveryOptionalResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); @@ -331,15 +314,6 @@ public TestDiscoveryRequiredResponse testDiscoveryRequired(TestDiscoveryRequired HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, TestDiscoveryRequiredResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-class.java index 40239eac67c2..79e3560406ce 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-async-client-class.java @@ -166,6 +166,19 @@ final class DefaultJsonAsyncClient implements JsonAsyncClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInput": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + default: + return Optional.empty(); + } + }; + private final ScheduledExecutorService executorService; private final Executor executor; @@ -223,18 +236,6 @@ public CompletableFuture aPostOperation(APostOperationRe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); String hostPrefix = "{StringMember}-foo."; @@ -301,18 +302,6 @@ public CompletableFuture aPostOperationWithOut HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationWithOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -370,18 +359,6 @@ public CompletableFuture bearerAuthOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, BearerAuthOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -468,18 +445,6 @@ public CompletableFuture eventStreamOperation(EventStreamOperationRequest HttpResponseHandler errorEventResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, eventstreamExceptionMetadataMapper); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); EventStreamTaggedUnionJsonMarshaller eventMarshaller = EventStreamTaggedUnionJsonMarshaller.builder() @@ -567,18 +532,6 @@ public CompletableFuture eventStreamO HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, EventStreamOperationWithOnlyInputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); EventStreamTaggedUnionJsonMarshaller eventMarshaller = EventStreamTaggedUnionJsonMarshaller.builder() @@ -673,18 +626,6 @@ public CompletableFuture eventStreamOperationWithOnlyOutput( HttpResponseHandler errorEventResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, eventstreamExceptionMetadataMapper); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); CompletableFuture future = new CompletableFuture<>(); @@ -766,18 +707,6 @@ public CompletableFuture getOperationWithCheck HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GetOperationWithChecksumResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -848,18 +777,6 @@ public CompletableFuture getWithoutRequiredMe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GetWithoutRequiredMembersResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -918,18 +835,6 @@ public CompletableFuture operationWithChe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithChecksumRequiredResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -993,18 +898,6 @@ public CompletableFuture operationWithR HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithRequestCompressionResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1069,18 +962,6 @@ public CompletableFuture paginatedOpera HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, PaginatedOperationWithResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1139,18 +1020,6 @@ public CompletableFuture paginatedOp HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1231,18 +1100,6 @@ public CompletableFuture putOperationWithChecksum( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, PutOperationWithChecksumResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1341,18 +1198,6 @@ public CompletableFuture streamingInputOperatio HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1430,18 +1275,6 @@ public CompletableFuture streamingInputOutputOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1529,18 +1362,6 @@ public CompletableFuture streamingOutputOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java index 9cf262b7f52a..bc8b00d106c4 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java @@ -123,6 +123,19 @@ final class DefaultJsonClient implements JsonClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInput": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + default: + return Optional.empty(); + } + }; + protected DefaultJsonClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsSyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -158,18 +171,6 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, APostOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(aPostOperationRequest, this.clientConfiguration); @@ -226,18 +227,6 @@ public APostOperationWithOutputResponse aPostOperationWithOutput( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationWithOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(aPostOperationWithOutputRequest, @@ -287,18 +276,6 @@ public BearerAuthOperationResponse bearerAuthOperation(BearerAuthOperationReques HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, BearerAuthOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(bearerAuthOperationRequest, @@ -348,18 +325,6 @@ public GetOperationWithChecksumResponse getOperationWithChecksum( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GetOperationWithChecksumResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(getOperationWithChecksumRequest, @@ -423,18 +388,6 @@ public GetWithoutRequiredMembersResponse getWithoutRequiredMembers( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GetWithoutRequiredMembersResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(getWithoutRequiredMembersRequest, @@ -485,18 +438,6 @@ public OperationWithChecksumRequiredResponse operationWithChecksumRequired( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithChecksumRequiredResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(operationWithChecksumRequiredRequest, @@ -553,18 +494,6 @@ public OperationWithRequestCompressionResponse operationWithRequestCompression( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithRequestCompressionResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(operationWithRequestCompressionRequest, @@ -621,18 +550,6 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, PaginatedOperationWithResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(paginatedOperationWithResultKeyRequest, @@ -683,18 +600,6 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(paginatedOperationWithoutResultKeyRequest, @@ -771,18 +676,6 @@ public ReturnT putOperationWithChecksum(PutOperationWithChecksumReques HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, PutOperationWithChecksumResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(putOperationWithChecksumRequest, @@ -867,18 +760,6 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(streamingInputOperationRequest, @@ -956,18 +837,6 @@ public ReturnT streamingInputOutputOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingInputOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(streamingInputOutputOperationRequest, @@ -1036,18 +905,6 @@ public ReturnT streamingOutputOperation(StreamingOutputOperationReques HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, StreamingOutputOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(streamingOutputOperationRequest, diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-presignedurl-async.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-presignedurl-async.java index 64ea09b9e581..6e67445d26ea 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-presignedurl-async.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-presignedurl-async.java @@ -85,6 +85,19 @@ final class DefaultJsonAsyncClient implements JsonAsyncClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInputException": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + default: + return Optional.empty(); + } + }; + protected DefaultJsonAsyncClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsAsyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -131,18 +144,6 @@ public CompletableFuture aPostOperation(APostOperationRe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, APostOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInputException": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInputException").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-rpcv2-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-rpcv2-async-client-class.java index adeebd6c4881..6d14da528d9f 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-rpcv2-async-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-rpcv2-async-client-class.java @@ -121,6 +121,25 @@ final class DefaultSmithyRpcV2ProtocolAsyncClient implements SmithyRpcV2Protocol private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "ValidationException": + return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") + .exceptionBuilderSupplier(ValidationException::builder).build()); + case "InvalidGreeting": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") + .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); + case "ComplexError": + return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") + .exceptionBuilderSupplier(ComplexErrorException::builder).build()); + default: + return Optional.empty(); + } + }; + protected DefaultSmithyRpcV2ProtocolAsyncClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsAsyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -164,24 +183,6 @@ public CompletableFuture emptyInputOutput(EmptyInputOu HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, EmptyInputOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -237,24 +238,6 @@ public CompletableFuture float16(Float16Request float16Request) HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, Float16Response::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -310,24 +293,6 @@ public CompletableFuture fractionalSeconds(Fractional HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, FractionalSecondsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -386,24 +351,6 @@ public CompletableFuture greetingWithErrors(Greeting HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GreetingWithErrorsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -459,24 +406,6 @@ public CompletableFuture noInputOutput(NoInputOutputReque HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, NoInputOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -535,24 +464,6 @@ public CompletableFuture operationWithDefaults( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithDefaultsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -611,24 +522,6 @@ public CompletableFuture optionalInputOutput( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OptionalInputOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -685,24 +578,6 @@ public CompletableFuture recursiveShapes(RecursiveShape HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, RecursiveShapesResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -760,24 +635,6 @@ public CompletableFuture rpcV2CborDenseMaps(RpcV2Cbo HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, RpcV2CborDenseMapsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -834,24 +691,6 @@ public CompletableFuture rpcV2CborLists(RpcV2CborListsRe HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, RpcV2CborListsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -910,24 +749,6 @@ public CompletableFuture rpcV2CborSparseMaps( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, RpcV2CborSparseMapsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -985,24 +806,6 @@ public CompletableFuture simpleScalarProperties( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, SimpleScalarPropertiesResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -1061,24 +864,6 @@ public CompletableFuture sparseNullsOperation( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, SparseNullsOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-rpcv2-sync.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-rpcv2-sync.java index b9499b2a1311..9ad62fa3a88e 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-rpcv2-sync.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-rpcv2-sync.java @@ -116,6 +116,25 @@ final class DefaultSmithyRpcV2ProtocolClient implements SmithyRpcV2ProtocolClien private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "ValidationException": + return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") + .exceptionBuilderSupplier(ValidationException::builder).build()); + case "InvalidGreeting": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") + .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); + case "ComplexError": + return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") + .exceptionBuilderSupplier(ComplexErrorException::builder).build()); + default: + return Optional.empty(); + } + }; + protected DefaultSmithyRpcV2ProtocolClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsSyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -147,24 +166,6 @@ public EmptyInputOutputResponse emptyInputOutput(EmptyInputOutputRequest emptyIn HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, EmptyInputOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(emptyInputOutputRequest, @@ -214,24 +215,6 @@ public Float16Response float16(Float16Request float16Request) throws AwsServiceE HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, Float16Response::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(float16Request, this.clientConfiguration); @@ -279,24 +262,6 @@ public FractionalSecondsResponse fractionalSeconds(FractionalSecondsRequest frac HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, FractionalSecondsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(fractionalSecondsRequest, @@ -349,24 +314,6 @@ public GreetingWithErrorsResponse greetingWithErrors(GreetingWithErrorsRequest g HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, GreetingWithErrorsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(greetingWithErrorsRequest, @@ -416,24 +363,6 @@ public NoInputOutputResponse noInputOutput(NoInputOutputRequest noInputOutputReq HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, NoInputOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(noInputOutputRequest, this.clientConfiguration); @@ -483,24 +412,6 @@ public OperationWithDefaultsResponse operationWithDefaults(OperationWithDefaults HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OperationWithDefaultsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(operationWithDefaultsRequest, @@ -550,24 +461,6 @@ public OptionalInputOutputResponse optionalInputOutput(OptionalInputOutputReques HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OptionalInputOutputResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(optionalInputOutputRequest, @@ -617,24 +510,6 @@ public RecursiveShapesResponse recursiveShapes(RecursiveShapesRequest recursiveS HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, RecursiveShapesResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(recursiveShapesRequest, @@ -685,24 +560,6 @@ public RpcV2CborDenseMapsResponse rpcV2CborDenseMaps(RpcV2CborDenseMapsRequest r HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, RpcV2CborDenseMapsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(rpcV2CborDenseMapsRequest, @@ -753,24 +610,6 @@ public RpcV2CborListsResponse rpcV2CborLists(RpcV2CborListsRequest rpcV2CborList HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, RpcV2CborListsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(rpcV2CborListsRequest, this.clientConfiguration); @@ -820,24 +659,6 @@ public RpcV2CborSparseMapsResponse rpcV2CborSparseMaps(RpcV2CborSparseMapsReques HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, RpcV2CborSparseMapsResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(rpcV2CborSparseMapsRequest, @@ -887,24 +708,6 @@ public SimpleScalarPropertiesResponse simpleScalarProperties(SimpleScalarPropert HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, SimpleScalarPropertiesResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(simpleScalarPropertiesRequest, @@ -955,24 +758,6 @@ public SparseNullsOperationResponse sparseNullsOperation(SparseNullsOperationReq HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, SparseNullsOperationResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "ValidationException": - return Optional.of(ExceptionMetadata.builder().errorCode("ValidationException") - .exceptionBuilderSupplier(ValidationException::builder).build()); - case "InvalidGreeting": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidGreeting") - .exceptionBuilderSupplier(InvalidGreetingException::builder).build()); - case "ComplexError": - return Optional.of(ExceptionMetadata.builder().errorCode("ComplexError") - .exceptionBuilderSupplier(ComplexErrorException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(sparseNullsOperationRequest, diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-unsigned-payload-trait-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-unsigned-payload-trait-async-client-class.java index d3d20ba326ef..f898f9da92fe 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-unsigned-payload-trait-async-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-unsigned-payload-trait-async-client-class.java @@ -120,6 +120,19 @@ final class DefaultDatabaseAsyncClient implements DatabaseAsyncClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInput": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + default: + return Optional.empty(); + } + }; + protected DefaultDatabaseAsyncClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsAsyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -166,18 +179,6 @@ public CompletableFuture deleteRow(DeleteRowRequest deleteRow HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, DeleteRowResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -237,18 +238,6 @@ public CompletableFuture getRow(GetRowRequest getRowRequest) { HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, GetRowResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -311,18 +300,6 @@ public CompletableFuture opWithSigv HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, OpWithSigv4AndSigv4AUnSignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -388,18 +365,6 @@ public CompletableFuture opWithSigv4SignedPayl HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpWithSigv4SignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -462,18 +427,6 @@ public CompletableFuture opWithSigv4UnSigned HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpWithSigv4UnSignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -544,18 +497,6 @@ public CompletableFuture opWithS HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, OpWithSigv4UnSignedPayloadAndStreamingResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -627,18 +568,6 @@ public CompletableFuture opWithSigv4aSignedPa HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpWithSigv4ASignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -701,18 +630,6 @@ public CompletableFuture opWithSigv4aUnSign HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpWithSigv4AUnSignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -780,18 +697,6 @@ public CompletableFuture opsWithSigv HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, OpsWithSigv4AndSigv4ASignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -855,18 +760,6 @@ public CompletableFuture putRow(PutRowRequest putRowRequest) { HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, PutRowResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); @@ -929,18 +822,6 @@ public CompletableFuture secon HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, SecondOpsWithSigv4AndSigv4ASignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-unsigned-payload-trait-sync-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-unsigned-payload-trait-sync-client-class.java index 69aa5fab1667..951dc25368e7 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-unsigned-payload-trait-sync-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-unsigned-payload-trait-sync-client-class.java @@ -115,6 +115,19 @@ final class DefaultDatabaseClient implements DatabaseClient { private final SdkClientConfiguration clientConfiguration; + private final Function> exceptionMetadataMapper = errorCode -> { + if (errorCode == null) { + return Optional.empty(); + } + switch (errorCode) { + case "InvalidInput": + return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) + .exceptionBuilderSupplier(InvalidInputException::builder).build()); + default: + return Optional.empty(); + } + }; + protected DefaultDatabaseClient(SdkClientConfiguration clientConfiguration) { this.clientHandler = new AwsSyncClientHandler(clientConfiguration); this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this) @@ -150,18 +163,6 @@ public DeleteRowResponse deleteRow(DeleteRowRequest deleteRowRequest) throws Inv HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, DeleteRowResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(deleteRowRequest, this.clientConfiguration); @@ -212,18 +213,6 @@ public GetRowResponse getRow(GetRowRequest getRowRequest) throws InvalidInputExc HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, GetRowResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(getRowRequest, this.clientConfiguration); @@ -274,18 +263,6 @@ public PutRowResponse putRow(PutRowRequest putRowRequest) throws InvalidInputExc HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(operationMetadata, PutRowResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(putRowRequest, this.clientConfiguration); @@ -338,18 +315,6 @@ public OpWithSigv4AndSigv4AUnSignedPayloadResponse opWithSigv4AndSigv4aUnSignedP HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpWithSigv4AndSigv4AUnSignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(opWithSigv4AndSigv4AUnSignedPayloadRequest, @@ -404,18 +369,6 @@ public OpWithSigv4SignedPayloadResponse opWithSigv4SignedPayload( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpWithSigv4SignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(opWithSigv4SignedPayloadRequest, @@ -470,18 +423,6 @@ public OpWithSigv4UnSignedPayloadResponse opWithSigv4UnSignedPayload( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpWithSigv4UnSignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(opWithSigv4UnSignedPayloadRequest, @@ -548,18 +489,6 @@ public OpWithSigv4UnSignedPayloadAndStreamingResponse opWithSigv4UnSignedPayload HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, OpWithSigv4UnSignedPayloadAndStreamingResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(opWithSigv4UnSignedPayloadAndStreamingRequest, @@ -624,18 +553,6 @@ public OpWithSigv4ASignedPayloadResponse opWithSigv4aSignedPayload( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpWithSigv4ASignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(opWithSigv4ASignedPayloadRequest, @@ -690,18 +607,6 @@ public OpWithSigv4AUnSignedPayloadResponse opWithSigv4aUnSignedPayload( HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpWithSigv4AUnSignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(opWithSigv4AUnSignedPayloadRequest, @@ -757,18 +662,6 @@ public OpsWithSigv4AndSigv4ASignedPayloadResponse opsWithSigv4andSigv4aSignedPay HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( operationMetadata, OpsWithSigv4AndSigv4ASignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(opsWithSigv4AndSigv4ASignedPayloadRequest, @@ -824,18 +717,6 @@ public SecondOpsWithSigv4AndSigv4ASignedPayloadResponse secondOpsWithSigv4andSig HttpResponseHandler responseHandler = protocolFactory .createResponseHandler(operationMetadata, SecondOpsWithSigv4AndSigv4ASignedPayloadResponse::builder); - Function> exceptionMetadataMapper = errorCode -> { - if (errorCode == null) { - return Optional.empty(); - } - switch (errorCode) { - case "InvalidInput": - return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400) - .exceptionBuilderSupplier(InvalidInputException::builder).build()); - default: - return Optional.empty(); - } - }; HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata, exceptionMetadataMapper); SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(