[Go-server] Fix formatting of go-server generated code (#7162)

* Add missing go-server petstore batch script

* Make go-server confirm to gofmt

bin/windows/go-petstore-server.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l go-server -o samples\server\petstore\go-api-server
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l go-server -o samples\server\petstore\go-api-server -DpackageName=petstoreserver  -Dservice
 
 java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/go-petstore.bat

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l go -o samples\client\petstore\go
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l go -o samples\client\petstore\go -DpackageName=petstore
 
 java %JAVA_OPTS% -jar %executable% %ags%

modules/swagger-codegen/src/main/resources/go-server/controller.mustache

@@ -6,14 +6,9 @@ import (
 )
 
 type {{classname}} struct {
+}{{#operation}}
 
-}
-
-{{#operation}}
 func {{nickname}}(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
-}
-
-{{/operation}}
-{{/operations}}
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
+}{{/operation}}{{/operations}}

modules/swagger-codegen/src/main/resources/go-server/logger.mustache

@@ -20,4 +20,4 @@ func Logger(inner http.Handler, name string) http.Handler {
             time.Since(start),
         )
     })
-}
+}

modules/swagger-codegen/src/main/resources/go-server/main.mustache

@@ -1,6 +1,9 @@
 package main
 
 import (
+	"log"
+	"net/http"
+
 	// WARNING!
 	// Change this to a fully-qualified import path
 	// once you place this file into your project.
@@ -9,14 +12,12 @@ import (
 	//    sw "github.com/myname/myrepo/{{apiPath}}"
 	//
 	sw "./{{apiPath}}"
-	"log"
-	"net/http"
 )
 
 func main() {
 	log.Printf("Server started")
 
 	router := sw.NewRouter()
-	
+
 	log.Fatal(http.ListenAndServe(":{{serverPort}}", router))
 }

modules/swagger-codegen/src/main/resources/go-server/routers.mustache

@@ -1,8 +1,9 @@
 package {{packageName}}
 
 import (
-	"net/http"
 	"fmt"
+	"net/http"
+
 	"github.com/gorilla/mux"
 )
 
@@ -42,13 +43,12 @@ var routes = Routes{
 		"GET",
 		"{{{basePathWithoutHost}}}/",
 		Index,
-	},
-{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}
+	},{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}
+
 	Route{
 		"{{operationId}}",
 		"{{httpMethod}}",
 		"{{{basePathWithoutHost}}}{{{path}}}",
 		{{operationId}},
-	},
-{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+	},{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
 }

samples/server/petstore/go-api-server/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.2.3-SNAPSHOT
+2.3.0-SNAPSHOT

samples/server/petstore/go-api-server/go/README.md

@@ -13,7 +13,8 @@ To see how to make this your own, look here:
 [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)
 
 - API version: 1.0.0
-- Build date: 2017-03-12T22:24:15.399-05:00
+- Build date: 2017-12-12T20:26:23.341Z
+
 
 ### Running the server
 To run the server, follow these simple steps:

samples/server/petstore/go-api-server/go/logger.go

@@ -20,4 +20,4 @@ func Logger(inner http.Handler, name string) http.Handler {
             time.Since(start),
         )
     })
-}
+}

samples/server/petstore/go-api-server/go/pet.go

@@ -5,46 +5,44 @@ import (
 )
 
 type Pet struct {
-
 }
 
 func AddPet(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func DeletePet(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func FindPetsByStatus(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func FindPetsByTags(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func GetPetById(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func UpdatePet(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func UpdatePetWithForm(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func UploadFile(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
-

samples/server/petstore/go-api-server/go/routers.go

@@ -1,8 +1,9 @@
 package petstoreserver
 
 import (
-	"net/http"
 	"fmt"
+	"net/http"
+
 	"github.com/gorilla/mux"
 )
 
@@ -183,5 +184,4 @@ var routes = Routes{
 		"/v2/user/{username}",
 		UpdateUser,
 	},
-
 }

samples/server/petstore/go-api-server/go/store.go

@@ -5,26 +5,24 @@ import (
 )
 
 type Store struct {
-
 }
 
 func DeleteOrder(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func GetInventory(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func GetOrderById(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func PlaceOrder(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
-

samples/server/petstore/go-api-server/go/user.go

@@ -5,46 +5,44 @@ import (
 )
 
 type User struct {
-
 }
 
 func CreateUser(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func CreateUsersWithArrayInput(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func CreateUsersWithListInput(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func DeleteUser(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func GetUserByName(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func LoginUser(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func LogoutUser(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
 
 func UpdateUser(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-		w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
 }
-

samples/server/petstore/go-api-server/main.go

@@ -1,6 +1,9 @@
 package main
 
 import (
+	"log"
+	"net/http"
+
 	// WARNING!
 	// Change this to a fully-qualified import path
 	// once you place this file into your project.
@@ -9,14 +12,12 @@ import (
 	//    sw "github.com/myname/myrepo/go"
 	//
 	sw "./go"
-	"log"
-	"net/http"
 )
 
 func main() {
 	log.Printf("Server started")
 
 	router := sw.NewRouter()
-	
+
 	log.Fatal(http.ListenAndServe(":8080", router))
 }