Merge pull request aws#696 from jeskew/fix/query-maps-with-location-n…

…ames Use the locationName in query serialization if present
karthikrkr · Jul 17, 2015 · b5212b6 · b5212b6
2 parents 1a69410 + 0799f05
commit b5212b6
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 0 deletions.
diff --git a/src/Api/Serializer/QueryParamBuilder.php b/src/Api/Serializer/QueryParamBuilder.php
@@ -20,6 +20,10 @@ protected function queryName(Shape $shape, $default = null)
             return $shape['queryName'];
         }
 
+        if (null !== $shape['locationName']) {
+            return $shape['locationName'];
+        }
+
         if ($this->isFlat($shape) && !empty($shape['member']['locationName'])) {
             return $shape['member']['locationName'];
         }

diff --git a/tests/Api/test_cases/protocols/input/query.json b/tests/Api/test_cases/protocols/input/query.json
@@ -288,6 +288,57 @@
       }
     ]
   },
+  {
+    "description": "Serialize map type with locationName",
+    "metadata": {
+      "protocol": "query",
+      "apiVersion": "2014-01-01"
+    },
+    "shapes": {
+      "InputShape": {
+        "type": "structure",
+        "members": {
+          "MapArg": {
+            "shape": "StringMap"
+          }
+        }
+      },
+      "StringMap": {
+        "type": "map",
+        "key": {
+          "shape": "StringType",
+          "locationName": "TheKey"
+        },
+        "value": {
+          "shape": "StringType",
+          "locationName": "TheValue"
+        }
+      },
+      "StringType": {
+        "type": "string"
+      }
+    },
+    "cases": [
+      {
+        "given": {
+          "input": {
+            "shape": "InputShape"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "MapArg": {
+            "key1": "val1",
+            "key2": "val2"
+          }
+        },
+        "serialized": {
+          "uri": "/",
+          "body": "Action=OperationName&Version=2014-01-01&MapArg.entry.1.TheKey=key1&MapArg.entry.1.TheValue=val1&MapArg.entry.2.TheKey=key2&MapArg.entry.2.TheValue=val2"
+        }
+      }
+    ]
+  },
   {
     "description": "Base64 encoded Blobs",
     "metadata": {