Skip to content

Commit 323da2c

Browse files
S-Saranya1S-Saranya1
committed
Fixing errors
1 parent 5bf2e16 commit 323da2c

9 files changed

+37
-37
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public Optional<CodeBlock> errorResponseHandler(OperationModel opModel) {
189189
ShapeModel exceptionShape = model.getShapes().get(exceptionName);
190190
String errorCode = exceptionShape.getErrorCode();
191191

192-
builder.add("case $S:\n", errorCode);
192+
builder.add("case $S:\n", exceptionShape.getC2jName());
193193
builder.add("return $T.of($T.builder()\n", Optional.class, ExceptionMetadata.class)
194194
.add(".errorCode($S)\n", errorCode);
195195
builder.add(populateHttpStatusCode(exceptionShape, model));

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

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

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public CompletableFuture<APostOperationResponse> aPostOperation(APostOperationRe
112112
operationMetadata, APostOperationResponse::builder);
113113
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
114114
switch (errorCode) {
115-
case "InvalidInput":
115+
case "InvalidInputException":
116116
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
117117
.exceptionBuilderSupplier(InvalidInputException::builder).build());
118118
default:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio
9797
APostOperationResponse::builder);
9898
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
9999
switch (errorCode) {
100-
case "InvalidInput":
100+
case "InvalidInputException":
101101
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
102102
.exceptionBuilderSupplier(InvalidInputException::builder).build());
103103
default:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public CompletableFuture<APostOperationResponse> aPostOperation(APostOperationRe
212212
operationMetadata, APostOperationResponse::builder);
213213
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
214214
switch (errorCode) {
215-
case "InvalidInput":
215+
case "InvalidInputException":
216216
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
217217
.exceptionBuilderSupplier(InvalidInputException::builder).build());
218218
default:
@@ -288,7 +288,7 @@ public CompletableFuture<APostOperationWithOutputResponse> aPostOperationWithOut
288288
operationMetadata, APostOperationWithOutputResponse::builder);
289289
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
290290
switch (errorCode) {
291-
case "InvalidInput":
291+
case "InvalidInputException":
292292
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
293293
.exceptionBuilderSupplier(InvalidInputException::builder).build());
294294
default:
@@ -809,7 +809,7 @@ public CompletableFuture<GetWithoutRequiredMembersResponse> getWithoutRequiredMe
809809
operationMetadata, GetWithoutRequiredMembersResponse::builder);
810810
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
811811
switch (errorCode) {
812-
case "InvalidInput":
812+
case "InvalidInputException":
813813
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
814814
.exceptionBuilderSupplier(InvalidInputException::builder).build());
815815
default:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio
147147
APostOperationResponse::builder);
148148
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
149149
switch (errorCode) {
150-
case "InvalidInput":
150+
case "InvalidInputException":
151151
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
152152
.exceptionBuilderSupplier(InvalidInputException::builder).build());
153153
default:
@@ -212,7 +212,7 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
212212
operationMetadata, APostOperationWithOutputResponse::builder);
213213
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
214214
switch (errorCode) {
215-
case "InvalidInput":
215+
case "InvalidInputException":
216216
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
217217
.exceptionBuilderSupplier(InvalidInputException::builder).build());
218218
default:
@@ -394,7 +394,7 @@ public GetWithoutRequiredMembersResponse getWithoutRequiredMembers(
394394
operationMetadata, GetWithoutRequiredMembersResponse::builder);
395395
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
396396
switch (errorCode) {
397-
case "InvalidInput":
397+
case "InvalidInputException":
398398
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
399399
.exceptionBuilderSupplier(InvalidInputException::builder).build());
400400
default:

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-unsigned-payload-trait-async-client-class.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public CompletableFuture<DeleteRowResponse> deleteRow(DeleteRowRequest deleteRow
147147
DeleteRowResponse::builder);
148148
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
149149
switch (errorCode) {
150-
case "InvalidInput":
150+
case "InvalidInputException":
151151
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
152152
.exceptionBuilderSupplier(InvalidInputException::builder).build());
153153
default:
@@ -216,7 +216,7 @@ public CompletableFuture<GetRowResponse> getRow(GetRowRequest getRowRequest) {
216216
GetRowResponse::builder);
217217
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
218218
switch (errorCode) {
219-
case "InvalidInput":
219+
case "InvalidInputException":
220220
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
221221
.exceptionBuilderSupplier(InvalidInputException::builder).build());
222222
default:
@@ -289,7 +289,7 @@ public CompletableFuture<OpWithSigv4AndSigv4AUnSignedPayloadResponse> opWithSigv
289289
.createResponseHandler(operationMetadata, OpWithSigv4AndSigv4AUnSignedPayloadResponse::builder);
290290
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
291291
switch (errorCode) {
292-
case "InvalidInput":
292+
case "InvalidInputException":
293293
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
294294
.exceptionBuilderSupplier(InvalidInputException::builder).build());
295295
default:
@@ -361,7 +361,7 @@ public CompletableFuture<OpWithSigv4SignedPayloadResponse> opWithSigv4SignedPayl
361361
operationMetadata, OpWithSigv4SignedPayloadResponse::builder);
362362
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
363363
switch (errorCode) {
364-
case "InvalidInput":
364+
case "InvalidInputException":
365365
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
366366
.exceptionBuilderSupplier(InvalidInputException::builder).build());
367367
default:
@@ -433,7 +433,7 @@ public CompletableFuture<OpWithSigv4UnSignedPayloadResponse> opWithSigv4UnSigned
433433
operationMetadata, OpWithSigv4UnSignedPayloadResponse::builder);
434434
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
435435
switch (errorCode) {
436-
case "InvalidInput":
436+
case "InvalidInputException":
437437
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
438438
.exceptionBuilderSupplier(InvalidInputException::builder).build());
439439
default:
@@ -517,7 +517,7 @@ public CompletableFuture<OpWithSigv4UnSignedPayloadAndStreamingResponse> opWithS
517517
.createResponseHandler(operationMetadata, OpWithSigv4UnSignedPayloadAndStreamingResponse::builder);
518518
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
519519
switch (errorCode) {
520-
case "InvalidInput":
520+
case "InvalidInputException":
521521
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
522522
.exceptionBuilderSupplier(InvalidInputException::builder).build());
523523
default:
@@ -596,7 +596,7 @@ public CompletableFuture<OpWithSigv4ASignedPayloadResponse> opWithSigv4aSignedPa
596596
operationMetadata, OpWithSigv4ASignedPayloadResponse::builder);
597597
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
598598
switch (errorCode) {
599-
case "InvalidInput":
599+
case "InvalidInputException":
600600
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
601601
.exceptionBuilderSupplier(InvalidInputException::builder).build());
602602
default:
@@ -668,7 +668,7 @@ public CompletableFuture<OpWithSigv4AUnSignedPayloadResponse> opWithSigv4aUnSign
668668
operationMetadata, OpWithSigv4AUnSignedPayloadResponse::builder);
669669
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
670670
switch (errorCode) {
671-
case "InvalidInput":
671+
case "InvalidInputException":
672672
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
673673
.exceptionBuilderSupplier(InvalidInputException::builder).build());
674674
default:
@@ -742,7 +742,7 @@ public CompletableFuture<OpsWithSigv4AndSigv4ASignedPayloadResponse> opsWithSigv
742742
.createResponseHandler(operationMetadata, OpsWithSigv4AndSigv4ASignedPayloadResponse::builder);
743743
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
744744
switch (errorCode) {
745-
case "InvalidInput":
745+
case "InvalidInputException":
746746
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
747747
.exceptionBuilderSupplier(InvalidInputException::builder).build());
748748
default:
@@ -812,7 +812,7 @@ public CompletableFuture<PutRowResponse> putRow(PutRowRequest putRowRequest) {
812812
PutRowResponse::builder);
813813
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
814814
switch (errorCode) {
815-
case "InvalidInput":
815+
case "InvalidInputException":
816816
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
817817
.exceptionBuilderSupplier(InvalidInputException::builder).build());
818818
default:
@@ -885,7 +885,7 @@ public CompletableFuture<SecondOpsWithSigv4AndSigv4ASignedPayloadResponse> secon
885885
.createResponseHandler(operationMetadata, SecondOpsWithSigv4AndSigv4ASignedPayloadResponse::builder);
886886
Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
887887
switch (errorCode) {
888-
case "InvalidInput":
888+
case "InvalidInputException":
889889
return Optional.of(ExceptionMetadata.builder().errorCode("InvalidInput").httpStatusCode(400)
890890
.exceptionBuilderSupplier(InvalidInputException::builder).build());
891891
default:

0 commit comments

Comments
 (0)