Skip to content

Commit 5c16cc1

Browse files
committed
changing the streambuff type to a vector
1 parent 5bb0545 commit 5c16cc1

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientBase.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ namespace client
103103
m_errorMarshaller(std::move(errorMarshaller)),
104104
m_interceptors({
105105
Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
106-
Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", *m_clientConfig, m_httpClient->IsDefaultAwsHttpClient())
106+
Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", [this]() {
107+
Aws::Client::ClientConfiguration chunkingConfig = *m_clientConfig;
108+
chunkingConfig.httpClientChunkedMode = m_httpClient->IsDefaultAwsHttpClient() ? m_clientConfig->httpClientChunkedMode : Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
109+
return chunkingConfig;
110+
}())
107111
})
108112
{
109113

src/aws-cpp-sdk-core/include/smithy/client/features/ChunkingInterceptor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ class AwsChunkedIOStream : public Aws::IOStream {
132132
*/
133133
class ChunkingInterceptor : public smithy::interceptor::Interceptor {
134134
public:
135-
explicit ChunkingInterceptor(const Aws::Client::ClientConfiguration& config, bool isDefaultHttpClient = true)
136-
: m_httpClientChunkedMode(isDefaultHttpClient ? config.httpClientChunkedMode : Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION) {}
135+
explicit ChunkingInterceptor(const Aws::Client::ClientConfiguration& config)
136+
: m_httpClientChunkedMode(config.httpClientChunkedMode) {}
137137
~ChunkingInterceptor() override = default;
138138

139139
ModifyRequestOutcome ModifyBeforeSigning(smithy::interceptor::InterceptorContext& context) override {

src/aws-cpp-sdk-core/source/client/AWSClient.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ struct RequestInfo
118118
}
119119
};
120120

121-
122-
123121
AWSClient::AWSClient(const Aws::Client::ClientConfiguration& configuration,
124122
const std::shared_ptr<Aws::Client::AWSAuthSigner>& signer,
125123
const std::shared_ptr<AWSErrorMarshaller>& errorMarshaller) :
@@ -142,7 +140,11 @@ AWSClient::AWSClient(const Aws::Client::ClientConfiguration& configuration,
142140
m_enableClockSkewAdjustment(configuration.enableClockSkewAdjustment),
143141
m_requestCompressionConfig(configuration.requestCompressionConfig),
144142
m_userAgentInterceptor{Aws::MakeShared<smithy::client::UserAgentInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_retryStrategy->GetStrategyName(), m_serviceName)},
145-
m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_httpClient->IsDefaultAwsHttpClient()), m_userAgentInterceptor}
143+
m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, [&configuration, this]() {
144+
ClientConfiguration chunkingConfig = configuration;
145+
chunkingConfig.httpClientChunkedMode = m_httpClient->IsDefaultAwsHttpClient() ? configuration.httpClientChunkedMode : Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
146+
return chunkingConfig;
147+
}()), m_userAgentInterceptor}
146148
{
147149
}
148150

@@ -168,7 +170,11 @@ AWSClient::AWSClient(const Aws::Client::ClientConfiguration& configuration,
168170
m_enableClockSkewAdjustment(configuration.enableClockSkewAdjustment),
169171
m_requestCompressionConfig(configuration.requestCompressionConfig),
170172
m_userAgentInterceptor{Aws::MakeShared<smithy::client::UserAgentInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_retryStrategy->GetStrategyName(), m_serviceName)},
171-
m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG, configuration), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_httpClient->IsDefaultAwsHttpClient()), m_userAgentInterceptor}
173+
m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG, configuration), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, [&configuration, this]() {
174+
ClientConfiguration chunkingConfig = configuration;
175+
chunkingConfig.httpClientChunkedMode = m_httpClient->IsDefaultAwsHttpClient() ? configuration.httpClientChunkedMode : Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
176+
return chunkingConfig;
177+
}()), m_userAgentInterceptor}
172178
{
173179
}
174180

src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@ void AwsSmithyClientBase::baseCopyAssign(const AwsSmithyClientBase& other,
106106

107107
m_interceptors = Aws::Vector<std::shared_ptr<interceptor::Interceptor>>{
108108
Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
109-
Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", *m_clientConfig, m_httpClient->IsDefaultAwsHttpClient())
109+
Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", [this]() {
110+
Aws::Client::ClientConfiguration chunkingConfig = *m_clientConfig;
111+
chunkingConfig.httpClientChunkedMode = m_httpClient->IsDefaultAwsHttpClient() ? m_clientConfig->httpClientChunkedMode : Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
112+
return chunkingConfig;
113+
}())
110114
};
111115

112116
baseCopyInit();

0 commit comments

Comments
 (0)