From 00c6e0a64bcff3dafa4743292ba3397135b7c092 Mon Sep 17 00:00:00 2001
From: Jesse Michael <jesse.michael@faithlife.com>
Date: Tue, 22 Oct 2019 00:27:08 -0700
Subject: [PATCH] Return Router interface from controller constructor. (#4196)

Update the go server api controller template to return the Router interface instead of the api specific router.
The Router interface type has the Routes function, which is what the generated `NewRouter` function needs. (not the api specific interface).
---
 .../src/main/resources/go-server/controller-api.mustache        | 2 +-
 samples/server/petstore/go-api-server/go/api_pet.go             | 2 +-
 samples/server/petstore/go-api-server/go/api_store.go           | 2 +-
 samples/server/petstore/go-api-server/go/api_user.go            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache
index 1476e06a647..61875a3de61 100644
--- a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache
+++ b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache
@@ -15,7 +15,7 @@ type {{classname}}Controller struct {
 }
 
 // New{{classname}}Controller creates a default api controller
-func New{{classname}}Controller(s {{classname}}Servicer) {{classname}}Router {
+func New{{classname}}Controller(s {{classname}}Servicer) Router {
 	return &{{classname}}Controller{ service: s }
 }
 
diff --git a/samples/server/petstore/go-api-server/go/api_pet.go b/samples/server/petstore/go-api-server/go/api_pet.go
index 1f1d70801bb..3f12afa82cd 100644
--- a/samples/server/petstore/go-api-server/go/api_pet.go
+++ b/samples/server/petstore/go-api-server/go/api_pet.go
@@ -23,7 +23,7 @@ type PetApiController struct {
 }
 
 // NewPetApiController creates a default api controller
-func NewPetApiController(s PetApiServicer) PetApiRouter {
+func NewPetApiController(s PetApiServicer) Router {
 	return &PetApiController{ service: s }
 }
 
diff --git a/samples/server/petstore/go-api-server/go/api_store.go b/samples/server/petstore/go-api-server/go/api_store.go
index e78d030da15..c67296a2424 100644
--- a/samples/server/petstore/go-api-server/go/api_store.go
+++ b/samples/server/petstore/go-api-server/go/api_store.go
@@ -23,7 +23,7 @@ type StoreApiController struct {
 }
 
 // NewStoreApiController creates a default api controller
-func NewStoreApiController(s StoreApiServicer) StoreApiRouter {
+func NewStoreApiController(s StoreApiServicer) Router {
 	return &StoreApiController{ service: s }
 }
 
diff --git a/samples/server/petstore/go-api-server/go/api_user.go b/samples/server/petstore/go-api-server/go/api_user.go
index 2715537a975..f883fc9f886 100644
--- a/samples/server/petstore/go-api-server/go/api_user.go
+++ b/samples/server/petstore/go-api-server/go/api_user.go
@@ -23,7 +23,7 @@ type UserApiController struct {
 }
 
 // NewUserApiController creates a default api controller
-func NewUserApiController(s UserApiServicer) UserApiRouter {
+func NewUserApiController(s UserApiServicer) Router {
 	return &UserApiController{ service: s }
 }