Skip to content

Commit 90b1b18

Browse files
sbisciglsbiscigl
committed
fix standlone client building
1 parent ee4d04d commit 90b1b18

7 files changed

Lines changed: 51 additions & 13 deletions

File tree

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceInit.vm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end
301301
#if($additionalCtorArgs.containsKey($ctorKey))#set($addArgDummy = $standaloneCredsCtor.put($ctorKey, $additionalCtorArgs.get($ctorKey)))#end
302302
#end
303303
${className}::${className}(const std::shared_ptr<Aws::Auth::AWSAuthSignerProvider>& signerProvider,
304+
${clsWSpace} ${clsWSpace} std::shared_ptr<${metadata.classNamePrefix}EndpointProviderBase> endpointProvider,
304305
${clsWSpace} ${clsWSpace} const ${clientConfigurationCls}& clientConfiguration#if($standaloneCredsCtor.isEmpty())) :#else,#end
305306

306307
#foreach($ctorArgument in $specCredsCtor)
@@ -310,7 +311,8 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end
310311
BASECLASS(clientConfiguration,
311312
signerProvider,
312313
Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)),
313-
${virtualAddressingInit}
314+
m_clientConfiguration(clientConfiguration),
315+
m_endpointProvider(endpointProvider ? std::move(endpointProvider) : Aws::MakeShared<${metadata.classNamePrefix}EndpointProvider>(ALLOCATION_TAG))
314316
{
315317
init(m_clientConfiguration);
316318
}

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/StreamRequestSource.vm‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
#set($serviceNamespace = $metadata.namespace)
66
\#include <aws/${metadata.projectName}/model/${typeInfo.className}.h>
77
\#include <aws/core/AmazonWebServiceResult.h>
8-
#if($shape.hasQueryStringMembers())
8+
#set($needsURIHeader = $shape.hasQueryStringMembers())
9+
#if(!$needsURIHeader)
10+
#foreach($member in $shape.members.entrySet())
11+
#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end
12+
#end
13+
#end
14+
#if($needsURIHeader)
915
\#include <aws/core/http/URI.h>
1016
#end
1117
#foreach($header in $typeInfo.sourceIncludes)
@@ -20,7 +26,7 @@
2026
using namespace ${rootNamespace}::${serviceNamespace}::Model;
2127
using namespace Aws::Utils::Stream;
2228
using namespace Aws::Utils;
23-
#if($shape.hasQueryStringMembers())
29+
#if($needsURIHeader)
2430
using namespace Aws::Http;
2531
#end
2632
using namespace Aws;

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
#set($serviceNamespace = $metadata.namespace)
66
\#include <aws/${metadata.projectName}/model/${typeInfo.className}.h>
77
\#include <aws/crt/cbor/Cbor.h>
8-
#if($shape.hasQueryStringMembers())
8+
#set($needsURIHeader = $shape.hasQueryStringMembers())
9+
#if(!$needsURIHeader)
10+
#foreach($member in $shape.members.entrySet())
11+
#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end
12+
#end
13+
#end
14+
#if($needsURIHeader)
915
\#include <aws/core/http/URI.h>
1016
#end
1117
#if($shape.supportsPresigning)
@@ -37,7 +43,7 @@
3743
using namespace ${rootNamespace}::${serviceNamespace}::Model;
3844
using namespace Aws::Crt::Cbor;
3945
using namespace Aws::Utils;
40-
#if($shape.hasQueryStringMembers())
46+
#if($needsURIHeader)
4147
using namespace Aws::Http;
4248
#end
4349

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonRequestSource.vm‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
#set($serviceNamespace = $metadata.namespace)
66
\#include <aws/${metadata.projectName}/model/${typeInfo.className}.h>
77
\#include <aws/core/utils/json/JsonSerializer.h>
8-
#if($shape.hasQueryStringMembers())
8+
#set($needsURIHeader = $shape.hasQueryStringMembers())
9+
#if(!$needsURIHeader)
10+
#foreach($member in $shape.members.entrySet())
11+
#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end
12+
#end
13+
#end
14+
#if($needsURIHeader)
915
\#include <aws/core/http/URI.h>
1016
#end
1117
#if($shape.supportsPresigning)
@@ -36,7 +42,7 @@
3642
using namespace ${rootNamespace}::${serviceNamespace}::Model;
3743
using namespace Aws::Utils::Json;
3844
using namespace Aws::Utils;
39-
#if($shape.hasQueryStringMembers())
45+
#if($needsURIHeader)
4046
using namespace Aws::Http;
4147
#end
4248

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
\#include <aws/${metadata.projectName}/model/${typeInfo.className}.h>
88
\#include <aws/core/utils/StringUtils.h>
99
\#include <aws/core/utils/memory/stl/AWSStringStream.h>
10-
#if($shape.hasQueryStringMembers())
10+
#set($needsURIHeader = $shape.hasQueryStringMembers())
11+
#if(!$needsURIHeader)
12+
#foreach($member in $shape.members.entrySet())
13+
#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end
14+
#end
15+
#end
16+
#if($needsURIHeader)
1117
\#include <aws/core/http/URI.h>
1218
#end
1319
#if($shape.hasBlobMembers())
@@ -30,7 +36,7 @@
3036

3137
using namespace ${rootNamespace}::${serviceNamespace}::Model;
3238
using namespace Aws::Utils;
33-
#if($shape.hasQueryStringMembers())
39+
#if($needsURIHeader)
3440
using namespace Aws::Http;
3541
#end
3642

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/PutBucketNotificationConfigurationRequest.vm‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
\#include <aws/core/utils/xml/XmlSerializer.h>
88
\#include <aws/core/utils/memory/stl/AWSStringStream.h>
99
\#include <aws/core/utils/UnreferencedParam.h>
10-
#if($shape.hasQueryStringMembers())
10+
#set($needsURIHeader = $shape.hasQueryStringMembers())
11+
#if(!$needsURIHeader)
12+
#foreach($member in $shape.members.entrySet())
13+
#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end
14+
#end
15+
#end
16+
#if($needsURIHeader)
1117
\#include <aws/core/http/URI.h>
1218
#end
1319
#foreach($header in $typeInfo.sourceIncludes)
@@ -22,7 +28,7 @@
2228
using namespace ${rootNamespace}::${serviceNamespace}::Model;
2329
using namespace Aws::Utils::Xml;
2430
using namespace Aws::Utils;
25-
#if($shape.hasQueryStringMembers())
31+
#if($needsURIHeader)
2632
using namespace Aws::Http;
2733
#end
2834

‎tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/XmlRequestSource.vm‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
1212
\#include <aws/core/utils/xml/XmlSerializer.h>
1313
\#include <aws/core/utils/memory/stl/AWSStringStream.h>
1414
\#include <aws/core/utils/UnreferencedParam.h>
15-
#if($shape.hasQueryStringMembers())
15+
#set($needsURIHeader = $shape.hasQueryStringMembers())
16+
#if(!$needsURIHeader)
17+
#foreach($member in $shape.members.entrySet())
18+
#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end
19+
#end
20+
#end
21+
#if($needsURIHeader)
1622
\#include <aws/core/http/URI.h>
1723
#end
1824
#foreach($header in $typeInfo.sourceIncludes)
@@ -40,7 +46,7 @@
4046
using namespace ${rootNamespace}::${serviceNamespace}::Model;
4147
using namespace Aws::Utils::Xml;
4248
using namespace Aws::Utils;
43-
#if($shape.hasQueryStringMembers())
49+
#if($needsURIHeader)
4450
using namespace Aws::Http;
4551
#end
4652

0 commit comments

Comments
 (0)