simplify instance name fallback

swaggo · Oct 11, 2021 · 31380a2 · 31380a2
1 parent c10e08d
commit 31380a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/gen/gen.go b/gen/gen.go
@@ -82,11 +82,10 @@ type Config struct {
 
 // Build builds swagger json file for given searchDir and mainAPIFile. Returns json
 func (g *Gen) Build(config *Config) error {
- instanceName := "swag.Name"
- if config.InstanceName != "" {
- instanceName = fmt.Sprintf("%q", config.InstanceName) // use a quoted string
+ if config.InstanceName == "" {
+ config.InstanceName = swag.Name
  }
- config.InstanceName = instanceName
+
  searchDirs := strings.Split(config.SearchDir, ",")
  for _, searchDir := range searchDirs {
  if _, err := os.Stat(searchDir); os.IsNotExist(err) {
@@ -334,6 +333,6 @@ func (s *s) ReadDoc() string {
 }
 
 func init() {
- swag.Register({{ .InstanceName }}, &s{})
+ swag.Register({{ printf "%q" .InstanceName }}, &s{})
 }
 `
diff --git a/gen/gen_test.go b/gen/gen_test.go
@@ -58,7 +58,7 @@ func TestGen_BuildInstanceName(t *testing.T) {
  if err != nil {
  t.Fatal(err)
  }
- if !strings.Contains(string(expectedCode), "swag.Register(swag.Name, &s{})") {
+ if !strings.Contains(string(expectedCode), "swag.Register(\"swagger\", &s{})") {
  t.Fatal(errors.New("generated go code does not contain the correct default registration sequence"))
  }