Skip to content

Commit a3934d0

Browse files
SergeyRyabininSergeyRyabinin
authored
Codegen: don't include exception classes that are not generated (#3390)
* Codegen: don't include exception classes that are not generated * Codegen for #3390
1 parent 8ba8f99 commit a3934d0

File tree

19 files changed

+9
-88
lines changed

19 files changed

+9
-88
lines changed

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/FlowResponseStream.h

-6
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,13 @@
55

66
#pragma once
77
#include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
8-
#include <aws/bedrock-agent-runtime/model/AccessDeniedException.h>
98
#include <aws/bedrock-agent-runtime/model/BadGatewayException.h>
10-
#include <aws/bedrock-agent-runtime/model/ConflictException.h>
119
#include <aws/bedrock-agent-runtime/model/DependencyFailedException.h>
1210
#include <aws/bedrock-agent-runtime/model/FlowCompletionEvent.h>
1311
#include <aws/bedrock-agent-runtime/model/FlowMultiTurnInputRequestEvent.h>
1412
#include <aws/bedrock-agent-runtime/model/FlowOutputEvent.h>
1513
#include <aws/bedrock-agent-runtime/model/FlowTraceEvent.h>
1614
#include <aws/bedrock-agent-runtime/model/InternalServerException.h>
17-
#include <aws/bedrock-agent-runtime/model/ResourceNotFoundException.h>
18-
#include <aws/bedrock-agent-runtime/model/ServiceQuotaExceededException.h>
19-
#include <aws/bedrock-agent-runtime/model/ThrottlingException.h>
20-
#include <aws/bedrock-agent-runtime/model/ValidationException.h>
2115
#include <utility>
2216

2317
namespace Aws

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/InlineAgentResponseStream.h

-6
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,13 @@
55

66
#pragma once
77
#include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
8-
#include <aws/bedrock-agent-runtime/model/AccessDeniedException.h>
98
#include <aws/bedrock-agent-runtime/model/BadGatewayException.h>
109
#include <aws/bedrock-agent-runtime/model/InlineAgentPayloadPart.h>
11-
#include <aws/bedrock-agent-runtime/model/ConflictException.h>
1210
#include <aws/bedrock-agent-runtime/model/DependencyFailedException.h>
1311
#include <aws/bedrock-agent-runtime/model/InlineAgentFilePart.h>
1412
#include <aws/bedrock-agent-runtime/model/InternalServerException.h>
15-
#include <aws/bedrock-agent-runtime/model/ResourceNotFoundException.h>
1613
#include <aws/bedrock-agent-runtime/model/InlineAgentReturnControlPayload.h>
17-
#include <aws/bedrock-agent-runtime/model/ServiceQuotaExceededException.h>
18-
#include <aws/bedrock-agent-runtime/model/ThrottlingException.h>
1914
#include <aws/bedrock-agent-runtime/model/InlineAgentTracePart.h>
20-
#include <aws/bedrock-agent-runtime/model/ValidationException.h>
2115
#include <utility>
2216

2317
namespace Aws

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/OptimizedPromptStream.h

-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55

66
#pragma once
77
#include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
8-
#include <aws/bedrock-agent-runtime/model/AccessDeniedException.h>
98
#include <aws/bedrock-agent-runtime/model/AnalyzePromptEvent.h>
109
#include <aws/bedrock-agent-runtime/model/BadGatewayException.h>
1110
#include <aws/bedrock-agent-runtime/model/DependencyFailedException.h>
1211
#include <aws/bedrock-agent-runtime/model/InternalServerException.h>
1312
#include <aws/bedrock-agent-runtime/model/OptimizedPromptEvent.h>
14-
#include <aws/bedrock-agent-runtime/model/ThrottlingException.h>
15-
#include <aws/bedrock-agent-runtime/model/ValidationException.h>
1613
#include <utility>
1714

1815
namespace Aws

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/ResponseStream.h

-7
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,13 @@
55

66
#pragma once
77
#include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
8-
#include <aws/bedrock-agent-runtime/model/AccessDeniedException.h>
98
#include <aws/bedrock-agent-runtime/model/BadGatewayException.h>
109
#include <aws/bedrock-agent-runtime/model/PayloadPart.h>
11-
#include <aws/bedrock-agent-runtime/model/ConflictException.h>
1210
#include <aws/bedrock-agent-runtime/model/DependencyFailedException.h>
1311
#include <aws/bedrock-agent-runtime/model/FilePart.h>
1412
#include <aws/bedrock-agent-runtime/model/InternalServerException.h>
15-
#include <aws/bedrock-agent-runtime/model/ModelNotReadyException.h>
16-
#include <aws/bedrock-agent-runtime/model/ResourceNotFoundException.h>
1713
#include <aws/bedrock-agent-runtime/model/ReturnControlPayload.h>
18-
#include <aws/bedrock-agent-runtime/model/ServiceQuotaExceededException.h>
19-
#include <aws/bedrock-agent-runtime/model/ThrottlingException.h>
2014
#include <aws/bedrock-agent-runtime/model/TracePart.h>
21-
#include <aws/bedrock-agent-runtime/model/ValidationException.h>
2215
#include <utility>
2316

2417
namespace Aws

‎generated/src/aws-cpp-sdk-bedrock-agent-runtime/include/aws/bedrock-agent-runtime/model/RetrieveAndGenerateStreamResponseOutput.h

-6
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,12 @@
55

66
#pragma once
77
#include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
8-
#include <aws/bedrock-agent-runtime/model/AccessDeniedException.h>
98
#include <aws/bedrock-agent-runtime/model/BadGatewayException.h>
109
#include <aws/bedrock-agent-runtime/model/CitationEvent.h>
11-
#include <aws/bedrock-agent-runtime/model/ConflictException.h>
1210
#include <aws/bedrock-agent-runtime/model/DependencyFailedException.h>
1311
#include <aws/bedrock-agent-runtime/model/GuardrailEvent.h>
1412
#include <aws/bedrock-agent-runtime/model/InternalServerException.h>
1513
#include <aws/bedrock-agent-runtime/model/RetrieveAndGenerateOutputEvent.h>
16-
#include <aws/bedrock-agent-runtime/model/ResourceNotFoundException.h>
17-
#include <aws/bedrock-agent-runtime/model/ServiceQuotaExceededException.h>
18-
#include <aws/bedrock-agent-runtime/model/ThrottlingException.h>
19-
#include <aws/bedrock-agent-runtime/model/ValidationException.h>
2014
#include <utility>
2115

2216
namespace Aws

‎generated/src/aws-cpp-sdk-bedrock-runtime/include/aws/bedrock-runtime/model/ConverseStreamOutput.h

-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
#include <aws/bedrock-runtime/model/ContentBlockStopEvent.h>
1212
#include <aws/bedrock-runtime/model/MessageStopEvent.h>
1313
#include <aws/bedrock-runtime/model/ConverseStreamMetadataEvent.h>
14-
#include <aws/bedrock-runtime/model/InternalServerException.h>
1514
#include <aws/bedrock-runtime/model/ModelStreamErrorException.h>
16-
#include <aws/bedrock-runtime/model/ValidationException.h>
17-
#include <aws/bedrock-runtime/model/ThrottlingException.h>
18-
#include <aws/bedrock-runtime/model/ServiceUnavailableException.h>
1915
#include <utility>
2016

2117
namespace Aws

‎generated/src/aws-cpp-sdk-bedrock-runtime/include/aws/bedrock-runtime/model/InvokeModelWithBidirectionalStreamOutput.h

-5
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
#pragma once
77
#include <aws/bedrock-runtime/BedrockRuntime_EXPORTS.h>
88
#include <aws/bedrock-runtime/model/BidirectionalOutputPayloadPart.h>
9-
#include <aws/bedrock-runtime/model/InternalServerException.h>
109
#include <aws/bedrock-runtime/model/ModelStreamErrorException.h>
11-
#include <aws/bedrock-runtime/model/ValidationException.h>
12-
#include <aws/bedrock-runtime/model/ThrottlingException.h>
13-
#include <aws/bedrock-runtime/model/ModelTimeoutException.h>
14-
#include <aws/bedrock-runtime/model/ServiceUnavailableException.h>
1510
#include <utility>
1611

1712
namespace Aws

‎generated/src/aws-cpp-sdk-bedrock-runtime/include/aws/bedrock-runtime/model/ResponseStream.h

-5
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
#pragma once
77
#include <aws/bedrock-runtime/BedrockRuntime_EXPORTS.h>
88
#include <aws/bedrock-runtime/model/PayloadPart.h>
9-
#include <aws/bedrock-runtime/model/InternalServerException.h>
109
#include <aws/bedrock-runtime/model/ModelStreamErrorException.h>
11-
#include <aws/bedrock-runtime/model/ValidationException.h>
12-
#include <aws/bedrock-runtime/model/ThrottlingException.h>
13-
#include <aws/bedrock-runtime/model/ModelTimeoutException.h>
14-
#include <aws/bedrock-runtime/model/ServiceUnavailableException.h>
1510
#include <utility>
1611

1712
namespace Aws

‎generated/src/aws-cpp-sdk-iotsitewise/include/aws/iotsitewise/model/ResponseStream.h

-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
#include <aws/iotsitewise/IoTSiteWise_EXPORTS.h>
88
#include <aws/iotsitewise/model/Trace.h>
99
#include <aws/iotsitewise/model/InvocationOutput.h>
10-
#include <aws/iotsitewise/model/AccessDeniedException.h>
1110
#include <aws/iotsitewise/model/ConflictingOperationException.h>
12-
#include <aws/iotsitewise/model/InternalFailureException.h>
13-
#include <aws/iotsitewise/model/InvalidRequestException.h>
14-
#include <aws/iotsitewise/model/LimitExceededException.h>
15-
#include <aws/iotsitewise/model/ResourceNotFoundException.h>
16-
#include <aws/iotsitewise/model/ThrottlingException.h>
1711
#include <utility>
1812

1913
namespace Aws

‎generated/src/aws-cpp-sdk-kinesis/include/aws/kinesis/model/SubscribeToShardEventStream.h

-9
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66
#pragma once
77
#include <aws/kinesis/Kinesis_EXPORTS.h>
88
#include <aws/kinesis/model/SubscribeToShardEvent.h>
9-
#include <aws/kinesis/model/ResourceNotFoundException.h>
10-
#include <aws/kinesis/model/ResourceInUseException.h>
11-
#include <aws/kinesis/model/KMSDisabledException.h>
12-
#include <aws/kinesis/model/KMSInvalidStateException.h>
13-
#include <aws/kinesis/model/KMSAccessDeniedException.h>
14-
#include <aws/kinesis/model/KMSNotFoundException.h>
15-
#include <aws/kinesis/model/KMSOptInRequired.h>
16-
#include <aws/kinesis/model/KMSThrottlingException.h>
17-
#include <aws/kinesis/model/InternalFailureException.h>
189
#include <utility>
1910

2011
namespace Aws

‎generated/src/aws-cpp-sdk-lexv2-runtime/include/aws/lexv2-runtime/model/StartConversationResponseEventStream.h

-8
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@
1111
#include <aws/lexv2-runtime/model/TextResponseEvent.h>
1212
#include <aws/lexv2-runtime/model/AudioResponseEvent.h>
1313
#include <aws/lexv2-runtime/model/HeartbeatEvent.h>
14-
#include <aws/lexv2-runtime/model/AccessDeniedException.h>
15-
#include <aws/lexv2-runtime/model/ResourceNotFoundException.h>
16-
#include <aws/lexv2-runtime/model/ValidationException.h>
17-
#include <aws/lexv2-runtime/model/ThrottlingException.h>
18-
#include <aws/lexv2-runtime/model/InternalServerException.h>
19-
#include <aws/lexv2-runtime/model/ConflictException.h>
20-
#include <aws/lexv2-runtime/model/DependencyFailedException.h>
21-
#include <aws/lexv2-runtime/model/BadGatewayException.h>
2214
#include <utility>
2315

2416
namespace Aws

‎generated/src/aws-cpp-sdk-logs/include/aws/logs/model/StartLiveTailResponseStream.h

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#include <aws/logs/CloudWatchLogs_EXPORTS.h>
88
#include <aws/logs/model/LiveTailSessionStart.h>
99
#include <aws/logs/model/LiveTailSessionUpdate.h>
10-
#include <aws/logs/model/SessionTimeoutException.h>
11-
#include <aws/logs/model/SessionStreamingException.h>
1210
#include <utility>
1311

1412
namespace Aws

‎generated/src/aws-cpp-sdk-sagemaker-runtime/include/aws/sagemaker-runtime/model/ResponseStream.h

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <aws/sagemaker-runtime/SageMakerRuntime_EXPORTS.h>
88
#include <aws/sagemaker-runtime/model/PayloadPart.h>
99
#include <aws/sagemaker-runtime/model/ModelStreamError.h>
10-
#include <aws/sagemaker-runtime/model/InternalStreamFailure.h>
1110
#include <utility>
1211

1312
namespace Aws

‎generated/src/aws-cpp-sdk-transcribestreaming/include/aws/transcribestreaming/model/CallAnalyticsTranscriptResultStream.h

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
#include <aws/transcribestreaming/TranscribeStreamingService_EXPORTS.h>
88
#include <aws/transcribestreaming/model/UtteranceEvent.h>
99
#include <aws/transcribestreaming/model/CategoryEvent.h>
10-
#include <aws/transcribestreaming/model/BadRequestException.h>
11-
#include <aws/transcribestreaming/model/LimitExceededException.h>
12-
#include <aws/transcribestreaming/model/InternalFailureException.h>
13-
#include <aws/transcribestreaming/model/ConflictException.h>
14-
#include <aws/transcribestreaming/model/ServiceUnavailableException.h>
1510
#include <utility>
1611

1712
namespace Aws

‎generated/src/aws-cpp-sdk-transcribestreaming/include/aws/transcribestreaming/model/MedicalScribeResultStream.h

-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
#pragma once
77
#include <aws/transcribestreaming/TranscribeStreamingService_EXPORTS.h>
88
#include <aws/transcribestreaming/model/MedicalScribeTranscriptEvent.h>
9-
#include <aws/transcribestreaming/model/BadRequestException.h>
10-
#include <aws/transcribestreaming/model/LimitExceededException.h>
11-
#include <aws/transcribestreaming/model/InternalFailureException.h>
12-
#include <aws/transcribestreaming/model/ConflictException.h>
13-
#include <aws/transcribestreaming/model/ServiceUnavailableException.h>
149
#include <utility>
1510

1611
namespace Aws

‎generated/src/aws-cpp-sdk-transcribestreaming/include/aws/transcribestreaming/model/MedicalTranscriptResultStream.h

-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
#pragma once
77
#include <aws/transcribestreaming/TranscribeStreamingService_EXPORTS.h>
88
#include <aws/transcribestreaming/model/MedicalTranscriptEvent.h>
9-
#include <aws/transcribestreaming/model/BadRequestException.h>
10-
#include <aws/transcribestreaming/model/LimitExceededException.h>
11-
#include <aws/transcribestreaming/model/InternalFailureException.h>
12-
#include <aws/transcribestreaming/model/ConflictException.h>
13-
#include <aws/transcribestreaming/model/ServiceUnavailableException.h>
149
#include <utility>
1510

1611
namespace Aws

‎generated/src/aws-cpp-sdk-transcribestreaming/include/aws/transcribestreaming/model/TranscriptResultStream.h

-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
#pragma once
77
#include <aws/transcribestreaming/TranscribeStreamingService_EXPORTS.h>
88
#include <aws/transcribestreaming/model/TranscriptEvent.h>
9-
#include <aws/transcribestreaming/model/BadRequestException.h>
10-
#include <aws/transcribestreaming/model/LimitExceededException.h>
11-
#include <aws/transcribestreaming/model/InternalFailureException.h>
12-
#include <aws/transcribestreaming/model/ConflictException.h>
13-
#include <aws/transcribestreaming/model/ServiceUnavailableException.h>
149
#include <utility>
1510

1611
namespace Aws

‎tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/Shape.java

+4
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@ public boolean isJsonModeledException() {
123123
return members.keySet().parallelStream().anyMatch(key -> !key.equals("Message") && !key.equals("message"));
124124
}
125125

126+
public boolean isModeledException() {
127+
return isXmlModeledException() || isJsonModeledException();
128+
}
129+
126130
public boolean isMemberRequired(String member) {
127131
ShapeMember shapeMember = members.get(member);
128132
return shapeMember != null && members.get(member).isRequired();

‎tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/CppViewHelper.java

+5
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,11 @@ public static Set<String> computeHeaderIncludes(String projectName, Shape shape)
353353
}
354354
}
355355
if(!next.isPrimitive()) {
356+
if (next.isException() && !next.isModeledException()) {
357+
// C++ SDK code generator skips generating exceptions that can be expressed using
358+
// a purely built-in C++ SDK Core exception class, so they must not be included.
359+
continue;
360+
}
356361
// if `next` is a direct member of a `shape` and they are mutually referenced
357362
if(next.isMutuallyReferencedWith(shape) &&
358363
shape.getMembers().values().parallelStream().anyMatch(member -> member.getShape().getName().equals(next.getName()))) {

0 commit comments

Comments
 (0)