Remove custom ResultWrapper property

ResultWrapper can be derived from operation names directly.
josharian · Mar 13, 2015 · a0112dc · a0112dc
1 parent 4f4e828
commit a0112dc
Show file tree

Hide file tree

Showing 22 changed files with 1,105 additions and 1,599 deletions.
diff --git a/aws/request.go b/aws/request.go
@@ -29,10 +29,9 @@ type Request struct {
 }
 
 type Operation struct {
-	Name          string
-	HTTPMethod    string
-	HTTPPath      string
-	ResultWrapper string
+	Name       string
+	HTTPMethod string
+	HTTPPath   string
 }
 
 func NewRequest(service *Service, operation *Operation, params interface{}, data interface{}) *Request {

diff --git a/internal/fixtures/protocol/output/query.json b/internal/fixtures/protocol/output/query.json
@@ -84,44 +84,6 @@
       }
     ]
   },
-  {
-    "description": "Custom result wrapper",
-    "metadata": {
-      "protocol": "query"
-    },
-    "shapes": {
-      "OutputShape": {
-        "type": "structure",
-        "members": {
-          "Str": {
-            "shape": "StringType"
-          }
-        }
-      },
-      "StringType": {
-        "type": "string"
-      }
-    },
-    "cases": [
-      {
-        "given": {
-          "output": {
-            "resultWrapper": "Wrapper",
-            "shape": "OutputShape"
-          },
-          "name": "OperationName"
-        },
-        "result": {
-          "Str": "myname"
-        },
-        "response": {
-          "status_code": 200,
-          "headers": {},
-          "body": "<OperationNameResponse><Wrapper><Str>myname</Str></Wrapper><ResponseMetadata><RequestId>request-id</RequestId></ResponseMetadata></OperationNameResponse>"
-        }
-      }
-    ]
-  },
   {
     "description": "Blob",
     "metadata": {

diff --git a/internal/model/api/operation.go b/internal/model/api/operation.go
@@ -41,7 +41,6 @@ func (c *{{ .API.StructName }}) {{ .ExportedName }}Request(` +
 			Name:       "{{ .Name }}",
 			{{ if ne .HTTP.Method "" }}HTTPMethod: "{{ .HTTP.Method }}",
 			{{ end }}{{ if ne .HTTP.RequestURI "" }}HTTPPath:   "{{ .HTTP.RequestURI }}",
-			{{ end }}{{ if ne .OutputRef.ResultWrapper "" }}ResultWrapper: "{{ .OutputRef.ResultWrapper }}",
 			{{ end }}
 		}
 	}

diff --git a/internal/model/api/shape.go b/internal/model/api/shape.go
@@ -17,7 +17,6 @@ type ShapeRef struct {
 	LocationName  string
 	QueryName     string
 	Flattened     bool
-	ResultWrapper string
 	Streaming     bool
 	XMLAttribute  bool
 	XMLNamespace  XMLInfo

diff --git a/internal/protocol/ec2query/unmarshal.go b/internal/protocol/ec2query/unmarshal.go
@@ -12,7 +12,7 @@ func Unmarshal(r *aws.Request) {
 	defer r.HTTPResponse.Body.Close()
 	if r.DataFilled() {
 		decoder := xml.NewDecoder(r.HTTPResponse.Body)
-		err := xmlutil.UnmarshalXML(r.Data, decoder, r.Operation.ResultWrapper)
+		err := xmlutil.UnmarshalXML(r.Data, decoder, "")
 		if err != nil && err != io.EOF {
 			r.Error = err
 			return

diff --git a/internal/protocol/query/unmarshal.go b/internal/protocol/query/unmarshal.go
@@ -12,7 +12,7 @@ func Unmarshal(r *aws.Request) {
 	defer r.HTTPResponse.Body.Close()
 	if r.DataFilled() {
 		decoder := xml.NewDecoder(r.HTTPResponse.Body)
-		err := xmlutil.UnmarshalXML(r.Data, decoder, r.Operation.ResultWrapper)
+		err := xmlutil.UnmarshalXML(r.Data, decoder, r.Operation.Name+"Result")
 		if err != nil && err != io.EOF {
 			r.Error = err
 			return