Merge pull request #122 from awslabs/API-GatewayAcceptSupport

Added support for accept header for api-gateway clients. Updated http…

Author: JonathanHenson

aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp

@@ -122,18 +122,26 @@ WinHttpSyncHttpClient::~WinHttpSyncHttpClient()
 
 void* WinHttpSyncHttpClient::OpenRequest(const Aws::Http::HttpRequest& request, void* connection, const Aws::StringStream& ss) const
 {
+    LPCWSTR accept[2] = { nullptr, nullptr };
 
     DWORD requestFlags = WINHTTP_FLAG_REFRESH |
         (request.GetUri().GetScheme() == Scheme::HTTPS ? WINHTTP_FLAG_SECURE : 0);
 
-    static LPCWSTR accept[2] = { L"*/*", nullptr };
+    Aws::WString acceptHeader(L"*/*");
+
+    if (request.HasHeader(Aws::Http::ACCEPT_HEADER)) 
+    {
+        acceptHeader = Aws::Utils::StringUtils::ToWString(request.GetHeaderValue(Aws::Http::ACCEPT_HEADER).c_str());  
+    }
+
+    accept[0] = acceptHeader.c_str();
 
     Aws::WString wss = StringUtils::ToWString(ss.str().c_str());
 
     HINTERNET hHttpRequest = WinHttpOpenRequest(connection, StringUtils::ToWString(HttpMethodMapper::GetNameForHttpMethod(request.GetMethod())).c_str(),
         wss.c_str(), nullptr, nullptr, accept, requestFlags);
 
-    //DISABLE_FEATURE settings need to be made after OpenRequest but before SendRequest
+      //DISABLE_FEATURE settings need to be made after OpenRequest but before SendRequest
     if (!m_allowRedirects)
     {
         requestFlags = WINHTTP_DISABLE_REDIRECTS;

aws-cpp-sdk-core/source/http/windows/WinINetSyncHttpClient.cpp

@@ -111,7 +111,17 @@ void* WinINetSyncHttpClient::OpenRequest(const Aws::Http::HttpRequest& request,
         INTERNET_FLAG_NO_CACHE_WRITE |
         (m_allowRedirects ? 0 : INTERNET_FLAG_NO_AUTO_REDIRECT);
 
-    static LPCSTR accept[2] = { "*/*", nullptr };
+    LPCSTR accept[2] = { nullptr, nullptr };
+
+    Aws::String acceptHeader("*/*");
+
+    if (request.HasHeader(Aws::Http::ACCEPT_HEADER))
+    {
+        acceptHeader = request.GetHeaderValue(Aws::Http::ACCEPT_HEADER);
+    }
+
+    accept[0] = acceptHeader.c_str();
+
     HINTERNET hHttpRequest = HttpOpenRequestA(connection, HttpMethodMapper::GetNameForHttpMethod(request.GetMethod()),
         ss.str().c_str(), nullptr, nullptr, accept, requestFlags, 0);
     AWS_LOGSTREAM_DEBUG(GetLogTag(), "HttpOpenRequestA returned handle " << hHttpRequest);

code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/Metadata.java

@@ -34,5 +34,6 @@ public class Metadata {
     private String protocol;
     private String projectName;
     private String classNamePrefix;
+    private String acceptHeader;
     private Map<String, String> additionalHeaders;
 }

code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/apigateway/APIGatewayRestJsonCppClientGenerator.java

@@ -33,6 +33,8 @@ public APIGatewayRestJsonCppClientGenerator() throws Exception {
 
     public SdkFileEntry[] generateSourceFiles(ServiceModel serviceModel) throws Exception {
 
+        serviceModel.getMetadata().setAcceptHeader("application/json");
+
         Shape invokeMethodRequest = serviceModel.getShapes().get("TestInvokeMethodRequest");
         Map<String, ShapeMember> members = invokeMethodRequest.getMembers();
 

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

@@ -29,6 +29,9 @@ namespace ${metadata.namespace}
       if(headers.size() == 0 || (headers.size() > 0 && headers.count(Aws::Http::CONTENT_TYPE_HEADER) == 0))
       {
         headers.insert(Aws::Http::HeaderValuePair(Aws::Http::CONTENT_TYPE_HEADER, ${CppViewHelper.computeRequestContentType($metadata)} ));
+#if($metadata.acceptHeader)
+        headers.insert(Aws::Http::HeaderValuePair(Aws::Http::ACCEPT_HEADER, "${metadata.acceptHeader}"));
+#end
       }
 
 #if($metadata.additionalHeaders)