refactoring

Author: Mikhail Podtserkovskiy

config/config.go

@@ -3,9 +3,9 @@ package config
 import (
 	"encoding/json"
 	"errors"
+	"github.com/Sirupsen/logrus"
 	log "github.com/Sirupsen/logrus"
 	"os"
-	"github.com/Sirupsen/logrus"
 )
 
 type Config struct {
@@ -33,7 +33,7 @@ type Logger struct {
 
 type DB struct {
 	Implementation string `json:"implementation"`
-	Connection string `json:"connection"`
+	Connection     string `json:"connection"`
 }
 
 type Statsd struct {

handlers/registerNode.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/qa-dev/jsonwire-grid/pool"
 	"github.com/qa-dev/jsonwire-grid/jsonwire"
+	"github.com/qa-dev/jsonwire-grid/pool"
 )
 
 type RegisterNode struct {

invoke.go

@@ -1,44 +1,20 @@
 package main
 
 import (
-	log "github.com/Sirupsen/logrus"
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/jmoiron/sqlx"
 	"github.com/qa-dev/jsonwire-grid/config"
-	"github.com/qa-dev/jsonwire-grid/pool"
 
 	"errors"
-	mysqlMigrations "github.com/qa-dev/jsonwire-grid/storage/migrations/mysql"
+	"github.com/qa-dev/jsonwire-grid/storage"
 	"github.com/qa-dev/jsonwire-grid/storage/mysql"
-	"github.com/rubenv/sql-migrate"
 )
 
-func invokeStorage(config config.Config) (storage pool.StorageInterface, err error) {
+func invokeStorageFactory(config config.Config) (factory storage.StorageFactoryInterface, err error) {
 	switch config.DB.Implementation {
 	case "mysql":
-		var db *sqlx.DB
-		db, err = sqlx.Open("mysql", config.DB.Connection)
-		if err != nil {
-			err = errors.New("Database connection error: " + err.Error())
-			return
-		}
-
-		storage = mysql.NewMysqlStorage(db)
-
-		migrations := &migrate.AssetMigrationSource{
-			Asset:    mysqlMigrations.Asset,
-			AssetDir: mysqlMigrations.AssetDir,
-			Dir:      "storage/migrations/mysql",
-		}
-		var n int
-		n, err = migrate.Exec(db.DB, "mysql", migrations, migrate.Up)
-		if err != nil {
-			err = errors.New("Migrations failed, " + err.Error())
-			return
-		}
-		log.Infof("Applied %d migrations!\n", n)
+		factory = new(mysql.Factory)
 	default:
-		err = errors.New("Invalid config, unknown param [DB.Implementation=" + config.DB.Implementation + "]")
+		err = errors.New("Invalid config, unknown param [db.implementation=" + config.DB.Implementation + "]")
 	}
 	return
 }

jsonwire/jsonwire.go

@@ -5,8 +5,8 @@ import (
 )
 
 type Message struct {
-	SessionId string        `json:"sessionId"`
-	Status    int           `json:"status"`
+	SessionId string      `json:"sessionId"`
+	Status    int         `json:"status"`
 	Value     interface{} `json:"value"`
 }
 
@@ -26,9 +26,9 @@ type Sessions struct {
 }
 
 type Register struct {
-	Class            string             `json:"class"`
+	Class            string         `json:"class"`
 	Configuration    *Configuration `json:"configuration"`
-	CapabilitiesList []Capabilities     `json:"capabilities"` // selenium 3
+	CapabilitiesList []Capabilities `json:"capabilities"` // selenium 3
 }
 
 type Capabilities map[string]interface{}
@@ -50,8 +50,8 @@ type Configuration struct {
 }
 
 type ApiProxy struct {
-	ID string `json:"id"`
+	ID      string      `json:"id"`
 	Request interface{} `json:"request"` //todo: пока не ясно зачем он нужен
-	Msg string `json:"msg"`
-	Success bool `json:"success"`
-}
+	Msg     string      `json:"msg"`
+	Success bool        `json:"success"`
+}

main.go

@@ -44,9 +44,13 @@ func main() {
 	if err != nil {
 		log.Fatal("Invalid value grid.busy_node_duration in config")
 	}
-	storage, err := invokeStorage(*cfg)
+	storageFactory, err := invokeStorageFactory(*cfg)
 	if err != nil {
-		log.Fatalf("Can't invoke storage, %s", err)
+		log.Fatalf("Can't invoke storage factory, %s", err)
+	}
+	storage, err := storageFactory.Create(*cfg)
+	if err != nil {
+		log.Fatalf("Can't create storage factory, %s", err)
 	}
 	poolInstance := pool.NewPool(storage)
 	poolInstance.SetBusyNodeDuration(busyNodeDuration)

selenium/client.go

@@ -2,12 +2,12 @@ package selenium
 
 import (
 	"encoding/json"
+	"errors"
 	"github.com/qa-dev/jsonwire-grid/jsonwire"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"errors"
 )
 
 type Client struct {
@@ -102,7 +102,7 @@ func (req request) send(outputStruct interface{}) error {
 	}
 	err = json.Unmarshal(body, outputStruct)
 	if err != nil {
-		err = errors.New("can't unmarshal response ["+ string(body)+"], " + err.Error())
+		err = errors.New("can't unmarshal response [" + string(body) + "], " + err.Error())
 		return err
 	}
 	return nil

storage/comon_test.go

@@ -1,8 +1,8 @@
 package storage
 
 import (
-	"github.com/stretchr/testify/assert"
 	"github.com/qa-dev/jsonwire-grid/pool"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 

storage/factory.go

@@ -0,0 +1,10 @@
+package storage
+
+import (
+	"github.com/qa-dev/jsonwire-grid/config"
+	"github.com/qa-dev/jsonwire-grid/pool"
+)
+
+type StorageFactoryInterface interface {
+	Create(config.Config) (pool.StorageInterface, error)
+}

storage/mysql/factory.go

@@ -0,0 +1,38 @@
+package mysql
+
+import (
+	"errors"
+	log "github.com/Sirupsen/logrus"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/jmoiron/sqlx"
+	"github.com/qa-dev/jsonwire-grid/config"
+	"github.com/qa-dev/jsonwire-grid/pool"
+	mysqlMigrations "github.com/qa-dev/jsonwire-grid/storage/migrations/mysql"
+	"github.com/rubenv/sql-migrate"
+)
+
+type Factory struct {
+}
+
+func (f *Factory) Create(config config.Config) (pool.StorageInterface, error) {
+	db, err := sqlx.Open("mysql", config.DB.Connection)
+	if err != nil {
+		err = errors.New("Database connection error: " + err.Error())
+		return nil, err
+	}
+
+	storage := NewMysqlStorage(db)
+
+	migrations := &migrate.AssetMigrationSource{
+		Asset:    mysqlMigrations.Asset,
+		AssetDir: mysqlMigrations.AssetDir,
+		Dir:      "storage/migrations/mysql",
+	}
+	n, err := migrate.Exec(db.DB, "mysql", migrations, migrate.Up)
+	if err != nil {
+		err = errors.New("Migrations failed, " + err.Error())
+		return nil, err
+	}
+	log.Infof("Applied %d migrations!\n", n)
+	return storage, nil
+}

storage/mysql_test.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
-	"github.com/rubenv/sql-migrate"
 	"github.com/qa-dev/jsonwire-grid/pool"
 	"github.com/qa-dev/jsonwire-grid/storage/mysql"
+	"github.com/rubenv/sql-migrate"
 	"os"
 	"strings"
 	"testing"