Use yaml.Unmarshal for swagger.yaml (#1932)

* Use yaml.Unmarshal for swagger.yaml * Add jsonToYAML to goagen/gen_swagger/generator.go * Update jsonToYAML
goadesign · Dec 21, 2018 · 4a2fb39 · 4a2fb39
1 parent 14b7b99
commit 4a2fb39
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/goagen/gen_swagger/generator.go b/goagen/gen_swagger/generator.go
@@ -99,12 +99,7 @@ func (g *Generator) Generate() (_ []string, err error) {
 	g.genfiles = append(g.genfiles, swaggerFile)
 
 	// YAML
-	var yamlSource interface{}
-	if err = json.Unmarshal(rawJSON, &yamlSource); err != nil {
-		return nil, err
-	}
-
-	rawYAML, err := yaml.Marshal(yamlSource)
+	rawYAML, err := jsonToYAML(rawJSON)
 	if err != nil {
 		return nil, err
 	}
@@ -124,3 +119,12 @@ func (g *Generator) Cleanup() {
 	}
 	g.genfiles = nil
 }
+
+func jsonToYAML(rawJSON []byte) ([]byte, error) {
+	var yamlSource interface{}
+	if err := yaml.Unmarshal(rawJSON, &yamlSource); err != nil {
+		return nil, err
+	}
+
+	return yaml.Marshal(yamlSource)
+}
diff --git a/goagen/gen_swagger/generator_export_test.go b/goagen/gen_swagger/generator_export_test.go
@@ -0,0 +1,4 @@
+package genswagger
+
+// Export internal functions for testing.
+var JSONToYAML = jsonToYAML
diff --git a/goagen/gen_swagger/generator_test.go b/goagen/gen_swagger/generator_test.go
@@ -36,3 +36,22 @@ var _ = Describe("NewGenerator", func() {
 		})
 	})
 })
+
+var _ = Describe("jsonToYAML", func() {
+	var rawYAML []byte
+	var err error
+
+	Context("with JSON which has a number type value", func() {
+		BeforeEach(func() {
+
+			rawYAML, _ = genswagger.JSONToYAML(
+				[]byte(`{"id":1234567}`),
+			)
+		})
+
+		It("converts JSON to YAML and keeps right number type", func() {
+			Ω(string(rawYAML)).Should(Equal("id: 1234567\n"))
+			Ω(err).ShouldNot(HaveOccurred())
+		})
+	})
+})