Fix #156, various parameter issues (#157)

Author: Jonathan Gordon

openapi2conv/openapi2_conv.go

@@ -156,6 +156,11 @@ func ToV3Parameter(parameter *openapi2.Parameter) (*openapi3.ParameterRef, *open
 	if parameter == nil {
 		return nil, nil, nil
 	}
+	if ref := parameter.Ref; len(ref) > 0 {
+		return &openapi3.ParameterRef{
+			Ref: ToV3Ref(ref),
+		}, nil, nil
+	}
 	in := parameter.In
 	if in == "body" {
 		result := &openapi3.RequestBody{
@@ -251,6 +256,7 @@ func ToV3SchemaRef(schema *openapi3.SchemaRef) *openapi3.SchemaRef {
 var ref2To3 = map[string]string{
 	"#/definitions/": "#/components/schemas/",
 	"#/responses/":   "#/components/responses/",
+	"#/parameters/":  "#/components/parameters/",
 }
 
 func ToV3Ref(ref string) string {
@@ -367,6 +373,7 @@ func FromV3Swagger(swagger *openapi3.Swagger) (*openapi2.Swagger, error) {
 		if pathItem == nil {
 			continue
 		}
+		result.AddOperation(path, "GET", nil)
 		for method, operation := range pathItem.Operations() {
 			if operation == nil {
 				continue
@@ -377,6 +384,22 @@ func FromV3Swagger(swagger *openapi3.Swagger) (*openapi2.Swagger, error) {
 			}
 			result.AddOperation(path, method, resultOperation)
 		}
+		params := openapi2.Parameters{}
+		for _, param := range pathItem.Parameters {
+			p, err := FromV3Parameter(param)
+			if err != nil {
+				return nil, err
+			}
+			params = append(params, p)
+		}
+		result.Paths[path].Parameters = params
+	}
+	result.Parameters = map[string]*openapi2.Parameter{}
+	for name, param := range swagger.Components.Parameters {
+		result.Parameters[name], err = FromV3Parameter(param)
+		if err != nil {
+			return nil, err
+		}
 	}
 	if m := swagger.Components.SecuritySchemes; m != nil {
 		resultSecuritySchemes := make(map[string]*openapi2.SecurityScheme)

openapi2conv/openapi2_conv_test.go

@@ -1,11 +1,10 @@
-package openapi2conv_test
+package openapi2conv
 
 import (
 	"encoding/json"
 	"testing"
 
 	"github.com/getkin/kin-openapi/openapi2"
-	"github.com/getkin/kin-openapi/openapi2conv"
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
@@ -15,7 +14,7 @@ func TestConvOpenAPIV3ToV2(t *testing.T) {
 	err := json.Unmarshal([]byte(exampleV3), &swagger3)
 	require.NoError(t, err)
 
-	actualV2, err := openapi2conv.FromV3Swagger(&swagger3)
+	actualV2, err := FromV3Swagger(&swagger3)
 	require.NoError(t, err)
 	data, err := json.Marshal(actualV2)
 	require.NoError(t, err)
@@ -27,7 +26,7 @@ func TestConvOpenAPIV2ToV3(t *testing.T) {
 	err := json.Unmarshal([]byte(exampleV2), &swagger2)
 	require.NoError(t, err)
 
-	actualV3, err := openapi2conv.ToV3Swagger(&swagger2)
+	actualV3, err := ToV3Swagger(&swagger2)
 	require.NoError(t, err)
 	data, err := json.Marshal(actualV3)
 	require.NoError(t, err)
@@ -47,6 +46,19 @@ const exampleV2 = `
     }
   ],
   "paths": {
+    "/another/{banana}/{id}": {
+        "parameters": [
+		  {
+            "$ref": "#/parameters/banana"
+          },
+          {
+            "in": "path",
+            "name": "id",
+			"type": "integer",
+			"required": true
+          }
+		]
+    },
     "/example": {
       "delete": {
         "description": "example delete",
@@ -185,6 +197,12 @@ const exampleV2 = `
       }
     }
   },
+  "parameters": {
+    "banana": {
+	  "in": "path",
+      "type": "string"
+    }
+  },
   "security": [
     {
       "default_security_0": [
@@ -214,6 +232,14 @@ const exampleV3 = `
         "description": "Insufficient permission to perform the requested action."
       }
     },
+    "parameters": {
+      "banana": {
+	    "in": "path",
+        "schema": {
+          "type": "string"
+        }
+      }
+    },
     "schemas": {
       "Item": {
         "type": "object",
@@ -255,6 +281,21 @@ const exampleV3 = `
     }
   ],
   "paths": {
+    "/another/{banana}/{id}": {
+        "parameters": [
+		  {
+            "$ref": "#/components/parameters/banana"
+          },
+          {
+            "in": "path",
+            "name": "id",
+            "schema": {
+              "type": "integer"
+            },
+			"required": true
+          }
+		]
+    },
     "/example": {
       "delete": {
         "description": "example delete",