Reformatted code

auth/casbin/authz_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/casbin/casbin"
 	"github.com/casbin/casbin/util"
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/revel/revel"
 	"github.com/revel/modules/orm/gorm/app"
+	"github.com/revel/revel"
 )
 
 var adapter = NewAdapter(DefaultDbParams())

csrf/app/csrf_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/revel/revel"
 )
 
-func NewTestController(w http.ResponseWriter, r *http.Request) *revel.Controller{
+func NewTestController(w http.ResponseWriter, r *http.Request) *revel.Controller {
 	context := revel.NewGoContext(nil)
 	context.Request.SetRequest(r)
 	context.Response.SetResponse(w)
@@ -30,7 +30,7 @@ var testFilters = []revel.Filter{
 func TestTokenInSession(t *testing.T) {
 	resp := httptest.NewRecorder()
 	getRequest, _ := http.NewRequest("GET", "http://www.example.com/", nil)
-	c := NewTestController(resp,getRequest)
+	c := NewTestController(resp, getRequest)
 
 	c.Session = make(revel.Session)
 
@@ -44,7 +44,7 @@ func TestTokenInSession(t *testing.T) {
 func TestPostWithoutToken(t *testing.T) {
 	resp := httptest.NewRecorder()
 	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-	c := NewTestController(resp,postRequest)
+	c := NewTestController(resp, postRequest)
 	c.Session = make(revel.Session)
 
 	testFilters[0](c, testFilters)
@@ -58,7 +58,7 @@ func TestNoReferrer(t *testing.T) {
 	resp := httptest.NewRecorder()
 	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
 
-	c := NewTestController(resp,postRequest)
+	c := NewTestController(resp, postRequest)
 	c.Session = make(revel.Session)
 
 	RefreshToken(c)
@@ -71,7 +71,7 @@ func TestNoReferrer(t *testing.T) {
 	formPostRequest.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	formPostRequest.Header.Add("Content-Length", strconv.Itoa(len(data.Encode())))
 
-	cnew := NewTestController(resp,formPostRequest)
+	cnew := NewTestController(resp, formPostRequest)
 	// and replace the old request
 	c.Request = cnew.Request
 
@@ -85,7 +85,7 @@ func TestNoReferrer(t *testing.T) {
 func TestRefererHttps(t *testing.T) {
 	resp := httptest.NewRecorder()
 	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-	c := NewTestController(resp,postRequest)
+	c := NewTestController(resp, postRequest)
 
 	c.Session = make(revel.Session)
 
@@ -100,7 +100,7 @@ func TestRefererHttps(t *testing.T) {
 	formPostRequest.Header.Add("Content-Length", strconv.Itoa(len(data.Encode())))
 	formPostRequest.Header.Add("Referer", "http://www.example.com/")
 
-	cnew := NewTestController(resp,formPostRequest)
+	cnew := NewTestController(resp, formPostRequest)
 	// and replace the old request
 	c.Request = cnew.Request
 
@@ -114,7 +114,7 @@ func TestRefererHttps(t *testing.T) {
 func TestHeaderWithToken(t *testing.T) {
 	resp := httptest.NewRecorder()
 	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-	c := NewTestController(resp,postRequest)
+	c := NewTestController(resp, postRequest)
 
 	c.Session = make(revel.Session)
 
@@ -126,7 +126,7 @@ func TestHeaderWithToken(t *testing.T) {
 	formPostRequest.Header.Add("X-CSRFToken", token)
 	formPostRequest.Header.Add("Referer", "http://www.example.com/")
 
-	cnew := NewTestController(resp,formPostRequest)
+	cnew := NewTestController(resp, formPostRequest)
 	// and replace the old request
 	c.Request = cnew.Request
 
@@ -140,7 +140,7 @@ func TestHeaderWithToken(t *testing.T) {
 func TestFormPostWithToken(t *testing.T) {
 	resp := httptest.NewRecorder()
 	postRequest, _ := http.NewRequest("POST", "http://www.example.com/", nil)
-	c := NewTestController(resp,postRequest)
+	c := NewTestController(resp, postRequest)
 
 	c.Session = make(revel.Session)
 
@@ -155,7 +155,7 @@ func TestFormPostWithToken(t *testing.T) {
 	formPostRequest.Header.Add("Content-Length", strconv.Itoa(len(data.Encode())))
 	formPostRequest.Header.Add("Referer", "http://www.example.com/")
 
-	cnew := NewTestController(resp,formPostRequest)
+	cnew := NewTestController(resp, formPostRequest)
 	// and replace the old request
 	c.Request = cnew.Request
 
@@ -172,7 +172,7 @@ func TestNoTokenInArgsWhenCORs(t *testing.T) {
 	getRequest, _ := http.NewRequest("GET", "http://www.example1.com/", nil)
 	getRequest.Header.Add("Referer", "http://www.example2.com/")
 
-	c := NewTestController(resp,getRequest)
+	c := NewTestController(resp, getRequest)
 	c.Session = make(revel.Session)
 
 	testFilters[0](c, testFilters)

db/app/db.go

@@ -44,10 +44,10 @@ func Init() {
 		revel.RevelLog.Fatal("Open database connection error", "error", err, "driver", Driver, "spec", Spec)
 	}
 
-	revel.OnAppStop(func(){
+	revel.OnAppStop(func() {
 		revel.RevelLog.Info("Closing the database (from module)")
-		if err := Db.Close();err!=nil {
-			revel.AppLog.Error("Failed to close the database", "error",err)
+		if err := Db.Close(); err != nil {
+			revel.AppLog.Error("Failed to close the database", "error", err)
 		}
 	})
 }

jobs/app/controllers/status.go

@@ -5,9 +5,9 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"errors"
+	"github.com/revel/cron"
 	"github.com/revel/modules/jobs/app/jobs"
 	"github.com/revel/revel"
-	"github.com/revel/cron"
 	"net/http"
 	"strings"
 )

jobs/app/jobs/init.go

@@ -7,7 +7,7 @@ import (
 var jobLog = revel.AppLog
 
 func init() {
-	revel.RegisterModuleInit(func(m *revel.Module){
+	revel.RegisterModuleInit(func(m *revel.Module) {
 		jobLog = m.Log
 	})
 }

orm/gorm/app/controllers/gorm.go

@@ -12,7 +12,7 @@ import (
 // Controller is a Revel controller with a pointer to the opened database
 type Controller struct {
 	*revel.Controller
-    DB *gorm.DB
+	DB *gorm.DB
 }
 
 func (c *Controller) setDB() revel.Result {
@@ -31,7 +31,7 @@ func (c *TxnController) Begin() revel.Result {
 
 	txn := gormdb.DB.Begin()
 	if txn.Error != nil {
-		c.Log.Panic("Transaction begine error","error",txn.Error)
+		c.Log.Panic("Transaction begine error", "error", txn.Error)
 	}
 
 	c.Txn = txn

orm/gorp/app/dbgorp.go

@@ -2,10 +2,10 @@ package gorp
 
 import (
 	"database/sql"
+	"github.com/revel/revel"
 	"github.com/revel/revel/logger"
 	sq "gopkg.in/Masterminds/squirrel.v1"
 	"gopkg.in/gorp.v2"
-	"github.com/revel/revel"
 )
 
 // DB Gorp
@@ -67,10 +67,10 @@ func (dbGorp *DbGorp) OpenDb() (err error) {
 	// Create the database map
 	dbGorp.Map = &gorp.DbMap{Db: db, Dialect: dbGorp.Info.Dialect}
 
-	revel.OnAppStop(func(){
+	revel.OnAppStop(func() {
 		revel.RevelLog.Info("Closing the database (from module)")
-		if err := dbGorp.Close();err!=nil {
-			revel.AppLog.Error("Failed to close the database", "error",err)
+		if err := dbGorp.Close(); err != nil {
+			revel.AppLog.Error("Failed to close the database", "error", err)
 		}
 	})
 
@@ -200,7 +200,7 @@ func (dbGorp *DbGorp) GetMap() DbGeneric {
 	return dbGorp.Map
 }
 func (dbGorp *DbGorp) Schema() (result string) {
-	if dbGorp.Info!=nil {
+	if dbGorp.Info != nil {
 		result = dbGorp.Info.DbSchema
 	}
 	return

orm/gorp/app/init_db.go

@@ -6,23 +6,24 @@ import (
 	_ "github.com/jinzhu/gorm/dialects/postgres" // postgres package
 	_ "github.com/jinzhu/gorm/dialects/sqlite"   // mysql package
 	"github.com/revel/revel"
+	"github.com/revel/revel/logger"
 	sq "gopkg.in/Masterminds/squirrel.v1"
 	"gopkg.in/gorp.v2"
-	"github.com/revel/revel/logger"
 )
 
 var (
 	// The database map to use to populate data
-	Db = &DbGorp{}
+	Db           = &DbGorp{}
 	moduleLogger logger.MultiLogger
 )
+
 func init() {
-	revel.RegisterModuleInit(func(module *revel.Module){
+	revel.RegisterModuleInit(func(module *revel.Module) {
 		moduleLogger = module.Log
 		moduleLogger.Debug("Assigned Logger")
 	})
 }
-func (dbResult *DbGorp)InitDb(open bool) (err error) {
+func (dbResult *DbGorp) InitDb(open bool) (err error) {
 	dbInfo := dbResult.Info
 
 	switch dbInfo.DbDriver {
@@ -57,7 +58,7 @@ func (dbResult *DbGorp)InitDb(open bool) (err error) {
 }
 
 // Initialize the database from revel.Config
-func InitDb(dbResult *DbGorp) (error) {
+func InitDb(dbResult *DbGorp) error {
 	params := DbInfo{}
 	params.DbDriver = revel.Config.StringDefault("db.driver", "sqlite3")
 	params.DbHost = revel.Config.StringDefault("db.host", "localhost")

orm/gorp/app/transaction.go

@@ -1,13 +1,15 @@
 package gorp
+
 import (
-	gorpa "gopkg.in/gorp.v2"
 	"database/sql"
 	sq "gopkg.in/Masterminds/squirrel.v1"
+	gorpa "gopkg.in/gorp.v2"
 )
+
 type (
 	// This is a small wrapped around gorp.Transaction so you can make use of the builder statements as well
 	Transaction struct {
-		Map *gorpa.Transaction
+		Map    *gorpa.Transaction
 		dbgorp *DbGorp
 	}
 )
@@ -25,7 +27,7 @@ func (txn *Transaction) Select(i interface{}, builder sq.SelectBuilder) (l []int
 		if err != nil && gorpa.NonFatalError(err) {
 			return list, nil
 		}
-		if err==sql.ErrNoRows {
+		if err == sql.ErrNoRows {
 			err = nil
 		}
 		return list, err
@@ -76,7 +78,7 @@ func (txn *Transaction) Update(list ...interface{}) (int64, error) {
 	return txn.Map.Update(list...)
 }
 func (txn *Transaction) Get(i interface{}, keys ...interface{}) (interface{}, error) {
-	return txn.Map.Get(i,keys...)
+	return txn.Map.Get(i, keys...)
 }
 func (txn *Transaction) Delete(i ...interface{}) (int64, error) {
 	return txn.Map.Delete(i...)

orm/gorp/app/workers.go

@@ -57,6 +57,7 @@ const (
 	EndJob
 	JobLongrunning
 )
+
 // Creates a container to run the group of workers (up to a max of maxNumWorkers), does not return to all workers are completed)
 // If returnResults is true then the task MUST write to the DbWorker.OutputChannel once for every task
 func WorkParallel(db *DbGorp, tasks []func(worker *DbWorker), returnResults bool, maxNumWorkers int, timeouts int) (results []interface{}, err error) {

server-engine/fasthttp/app/graceful_listener.go

@@ -1,10 +1,10 @@
 package fasthttp
 
 import (
-	"time"
 	"fmt"
 	"net"
 	"sync/atomic"
+	"time"
 )
 
 type GracefulListener struct {
@@ -105,4 +105,4 @@ func (c *gracefulConn) Close() error {
 	c.ln.closeConn()
 
 	return nil
-}
+}

server-engine/fasthttp/app/server-fasthttp.go

@@ -5,29 +5,29 @@ import (
 	"fmt"
 	"github.com/revel/revel"
 	"github.com/valyala/fasthttp"
+	"github.com/valyala/fasthttp/reuseport"
 	"io"
 	"mime/multipart"
 	"net"
 	"net/http"
 	"net/url"
+	"os"
+	"os/signal"
+	"path"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
-	"sort"
-	"github.com/valyala/fasthttp/reuseport"
-	"os/signal"
-	"os"
-	"path"
 )
 
 type FastHTTPServer struct {
 	Server           *fasthttp.Server
 	ServerInit       *revel.EngineInit
 	MaxMultipartSize int64
-	HttpMuxList          revel.ServerMuxList
-	HasAppMux            bool
-	signalChan chan os.Signal
-  graceful net.Listener
+	HttpMuxList      revel.ServerMuxList
+	HasAppMux        bool
+	signalChan       chan os.Signal
+	graceful         net.Listener
 }
 
 var serverLog = revel.AppLog
@@ -76,12 +76,12 @@ func (f *FastHTTPServer) Start() {
 		time.Sleep(100 * time.Millisecond)
 		fmt.Printf("\nListening on fasthttp %s...\n", f.ServerInit.Address)
 	}()
-	if f.ServerInit.Network=="tcp" {
+	if f.ServerInit.Network == "tcp" {
 		f.ServerInit.Network = "tcp4"
 	}
 	listener, err := reuseport.Listen(f.ServerInit.Network, f.ServerInit.Address)
 	if err != nil {
-		serverLog.Fatal("Failed to listen http:", "error", err, "network",f.ServerInit.Network,"address", f.ServerInit.Address)
+		serverLog.Fatal("Failed to listen http:", "error", err, "network", f.ServerInit.Network, "address", f.ServerInit.Address)
 	}
 
 	// create a graceful shutdown listener
@@ -113,7 +113,7 @@ func (f *FastHTTPServer) RequestHandler(ctx *fasthttp.RequestCtx) {
 }
 
 // Handle the request and response for the servers mux
-func (f *FastHTTPServer) handleAppMux(ctx *fasthttp.RequestCtx) (result  bool) {
+func (f *FastHTTPServer) handleAppMux(ctx *fasthttp.RequestCtx) (result bool) {
 	// Check the prefix and split them
 	cpath := string(ctx.Path())
 	requestPath := path.Clean(cpath)
@@ -125,7 +125,7 @@ func (f *FastHTTPServer) handleAppMux(ctx *fasthttp.RequestCtx) (result  bool) {
 		defer func() {
 			if err := recover(); err != nil {
 				localLog.Error("An error was caught using the handler", "path", requestPath, "error", err)
-				fmt.Fprintf(ctx,"Unable to handle response for third part mux %v",err)
+				fmt.Fprintf(ctx, "Unable to handle response for third part mux %v", err)
 				ctx.Response.SetStatusCode(http.StatusInternalServerError)
 				return
 			}
@@ -141,7 +141,6 @@ func (f *FastHTTPServer) handleAppMux(ctx *fasthttp.RequestCtx) (result  bool) {
 	return
 }
 
-
 // ClientIP method returns client IP address from HTTP request.
 //
 // Note: Set property "app.behind.proxy" to true only if Revel is running
@@ -200,8 +199,8 @@ func (f *FastHTTPServer) Event(event revel.Event, args interface{}) revel.EventR
 			revel.RaiseEvent(revel.ENGINE_SHUTDOWN_REQUEST, nil)
 		}()
 	case revel.ENGINE_SHUTDOWN_REQUEST:
-		if err := f.graceful.Close();err!=nil {
-			serverLog.Fatal("Failed to close fasthttp server gracefully, exiting using os.exit","error",err)
+		if err := f.graceful.Close(); err != nil {
+			serverLog.Fatal("Failed to close fasthttp server gracefully, exiting using os.exit", "error", err)
 		}
 	default: