Revert RESTJSON and RESTXML changes of SDK v1.11.0 (#1551)

* Revert "API Marshaler: Add generated marshalers for RESTJSON protocol (#1547)" This reverts commit 1a10a10. Reverts RESTJSON marshaler improvement due to bug in RESTXML * Revert "API Marshaling: Add generated marshalers for RESTXML protocol (#1409)" This reverts commit 37448a9. Reverts RESTXML due to #1550
aws · Sep 26, 2017 · 6a946b2 · 6a946b2
1 parent e0f1555
commit 6a946b2
Show file tree

Hide file tree

Showing 56 changed files with 247 additions and 49,594 deletions.
diff --git a/models/protocol_tests/generate.go b/models/protocol_tests/generate.go
@@ -358,7 +358,6 @@ func generateTestSuite(filename string) string {
 		svcPrefix := inout + "Service" + strconv.Itoa(i+1)
 		suite.API.Metadata.ServiceAbbreviation = svcPrefix + "ProtocolTest"
 		suite.API.Operations = map[string]*api.Operation{}
-
 		for idx, c := range suite.Cases {
 			c.Given.ExportedName = svcPrefix + "TestCaseOperation" + strconv.Itoa(idx+1)
 			suite.API.Operations[c.Given.ExportedName] = c.Given
@@ -371,9 +370,6 @@ func generateTestSuite(filename string) string {
 		suite.API.Setup()
 		suite.API.Metadata.EndpointPrefix = suite.API.PackageName()
 
-		// TODO until generated marshalers are all supported
-		suite.API.EnableSelectGeneratedMarshalers()
-
 		// Sort in order for deterministic test generation
 		names := make([]string, 0, len(suite.API.Shapes))
 		for n := range suite.API.Shapes {

diff --git a/private/model/api/api.go b/private/model/api/api.go
@@ -46,10 +46,6 @@ type API struct {
 	// Set to true to not generate struct field accessors
 	NoGenStructFieldAccessors bool
 
-	// Set to true to not generate (un)marshalers
-	NoGenMarshalers   bool
-	NoGenUnmarshalers bool
-
 	SvcClientImportPath string
 
 	initialized bool
@@ -276,9 +272,6 @@ func (a *API) APIGoCode() string {
 		a.imports["github.com/aws/aws-sdk-go/private/protocol/"+a.ProtocolPackage()] = true
 		a.imports["github.com/aws/aws-sdk-go/private/protocol"] = true
 	}
-	if !a.NoGenMarshalers || !a.NoGenUnmarshalers {
-		a.imports["github.com/aws/aws-sdk-go/private/protocol"] = true
-	}
 
 	for _, op := range a.Operations {
 		if op.AuthType == "none" {

diff --git a/private/model/api/customization_passes.go b/private/model/api/customization_passes.go
@@ -47,21 +47,6 @@ func (a *API) customizationPasses() {
 	if fn := svcCustomizations[a.PackageName()]; fn != nil {
 		fn(a)
 	}
-
-	// TODO until generated marshalers are all supported
-	a.EnableSelectGeneratedMarshalers()
-}
-
-func (a *API) EnableSelectGeneratedMarshalers() {
-	// Selectivily enable generated marshalers as available
-	a.NoGenMarshalers = true
-	a.NoGenUnmarshalers = true
-
-	// Enable generated marshalers
-	switch a.Metadata.Protocol {
-	case "rest-xml", "rest-json":
-		a.NoGenMarshalers = false
-	}
 }
 
 // s3Customizations customizes the API generation to replace values specific to S3.

diff --git a/private/model/api/passes.go b/private/model/api/passes.go
@@ -61,15 +61,6 @@ func (a *API) resolveReferences() {
 			o.ErrorRefs[i].Shape.IsError = true
 		}
 	}
-
-	for _, s := range a.Shapes {
-		switch s.Type {
-		case "list":
-			s.MemberRef.Shape.UsedInList = true
-		case "map":
-			s.ValueRef.Shape.UsedInMap = true
-		}
-	}
 }
 
 // A referenceResolver provides a way to resolve shape references to

diff --git a/private/model/api/shape.go b/private/model/api/shape.go
@@ -78,9 +78,6 @@ type Shape struct {
 
 	OrigShapeName string `json:"-"`
 
-	UsedInMap  bool
-	UsedInList bool
-
 	// Defines if the shape is a placeholder and should not be used directly
 	Placeholder bool
 
@@ -188,18 +185,10 @@ func (s *Shape) GoStructValueType(name string, ref *ShapeRef) string {
 	return v
 }
 
-func (s *Shape) IsRefPayload(name string) bool {
-	return s.Payload == name
-}
-
-func (s *Shape) IsRefPayloadReader(name string, ref *ShapeRef) bool {
-	return (ref.Streaming || ref.Shape.Streaming) && s.IsRefPayload(name)
-}
-
 // GoStructType returns the type of a struct field based on the API
 // model definition.
 func (s *Shape) GoStructType(name string, ref *ShapeRef) string {
-	if s.IsRefPayloadReader(name, ref) {
+	if (ref.Streaming || ref.Shape.Streaming) && s.Payload == name {
 		rtype := "io.ReadSeeker"
 		if strings.HasSuffix(s.ShapeName, "Output") {
 			rtype = "io.ReadCloser"
@@ -524,9 +513,7 @@ func (s *Shape) NestedShape() *Shape {
 }
 
 var structShapeTmpl = template.Must(template.New("StructShape").Funcs(template.FuncMap{
-	"GetCrosslinkURL":      GetCrosslinkURL,
-	"MarshalShapeGoCode":   MarshalShapeGoCode,
-	"UnmarshalShapeGoCode": UnmarshalShapeGoCode,
+	"GetCrosslinkURL": GetCrosslinkURL,
 }).Parse(`
 {{ .Docstring }}
 {{ if ne $.OrigShapeName "" -}}
@@ -610,13 +597,6 @@ func (s *{{ $builderShapeName }}) get{{ $name }}() (v {{ $context.GoStructValueT
 
 {{ end }}
 {{ end }}
-
-{{ if not $.API.NoGenMarshalers -}}
-{{ MarshalShapeGoCode $ }}
-{{- end }}
-{{ if not $.API.NoGenUnmarshalers -}}
-{{ UnmarshalShapeGoCode $ }}
-{{- end }}
 `))
 
 var enumShapeTmpl = template.Must(template.New("EnumShape").Parse(`