Fix headers for Event streaming & fix AddPathSegment bug

Author: sbaluja

tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/CborCppClientGenerator.java

@@ -90,11 +90,6 @@ protected SdkFileEntry generateModelHeaderFile(ServiceModel serviceModel, Map.En
 
     @Override
     protected SdkFileEntry generateModelSourceFile(ServiceModel serviceModel, Map.Entry<String, Shape> shapeEntry, final Map<String, CppShapeInformation> shapeInformationCache) {
-        Map<String, String> cborSpecificHeaders = new HashMap<>();
-        cborSpecificHeaders.put("Accept", "application/cbor");
-        cborSpecificHeaders.put("smithy-protocol", "rpc-v2-cbor");
-        serviceModel.getMetadata().setAdditionalHeaders(cborSpecificHeaders);
-
         Shape shape = shapeEntry.getValue();
         if (shape.isResult() && shape.hasEventStreamMembers())
             return null;
@@ -126,11 +121,20 @@ protected SdkFileEntry generateModelSourceFile(ServiceModel serviceModel, Map.En
                 if (shape.hasEventStreamMembers()) {
                     HashMap<String, String> headersMap = new HashMap<>(10);
                     headersMap.put("Aws::Http::CONTENT_TYPE_HEADER", "Aws::AMZN_EVENTSTREAM_CONTENT_TYPE");
+                    headersMap.put("Aws::Http::ACCEPT_HEADER", "Aws::AMZN_EVENTSTREAM_CONTENT_TYPE");
+                    headersMap.put("\"smithy-protocol\"", "\"rpc-v2-cbor\"");
                     context.put("requestSpecificHeaders", headersMap);
                 }
                 template = velocityEngine.getTemplate("/com/amazonaws/util/awsclientgenerator/velocity/cpp/StreamRequestSource.vm", StandardCharsets.UTF_8.name());
             }
             else if (shape.isRequest()) {
+                Map<String, String> cborSpecificHeaders = new HashMap<>();
+                cborSpecificHeaders.put("Aws::Http::ACCEPT_HEADER", "Aws::CBOR_CONTENT_TYPE");
+                cborSpecificHeaders.put("\"smithy-protocol\"", "\"rpc-v2-cbor\"");
+                if(shape.hasMembers()){
+                    cborSpecificHeaders.put("Aws::Http::CONTENT_TYPE_HEADER", "Aws::CBOR_CONTENT_TYPE");
+                }
+                context.put("requestSpecificHeaders", cborSpecificHeaders);
                 template = velocityEngine.getTemplate("/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm", StandardCharsets.UTF_8.name());
             }
             else if (shape.isResult() && shape.hasStreamMembers()) {

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

@@ -63,8 +63,8 @@
     Aws::Http::HeaderValueCollection ${typeInfo.className}::GetRequestSpecificHeaders() const
     {
         Aws::Http::HeaderValueCollection headers;
-        #if($shape.hasMembers())
-        headers.emplace(Aws::Http::HeaderValuePair(Aws::Http::CONTENT_TYPE_HEADER, Aws::CBOR_CONTENT_TYPE ));
+        #foreach($headerEntry in $requestSpecificHeaders.entrySet())
+            headers.emplace(${headerEntry.key}, ${headerEntry.value});
         #end
         #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassHeaderMembersSource.vm")
         return headers;

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

@@ -37,7 +37,7 @@ ${indent}      return;
 ${indent}  }
 #end
 #if($metadata.findFirstSupportedProtocol() == "smithy-rpc-v2-cbor")
-${indent}  endpointResolutionOutcome.GetResult().AddPathSegment("/service/${serviceModel.metadata.targetPrefix}/operation/${operation.name}");
+${indent}  endpointResolutionOutcome.GetResult().AddPathSegments("/service/${serviceModel.metadata.targetPrefix}/operation/${operation.name}");
 #end
 #if($operation.http.requestUri.contains("?"))
 ${indent}  Aws::StringStream ss;