Make NewConn and NewCustomizedConn into methods

Author: dveeden

cmd/go-mysqlserver/main.go

@@ -26,7 +26,8 @@ func main() {
 
 	// Create a connection with user root and an empty password.
 	// You can use your own handler to handle command here.
-	conn, err := server.NewConn(c, "root", "", server.EmptyHandler{})
+	srv := server.NewDefaultServer()
+	conn, err := srv.NewConn(c, "root", "", server.EmptyHandler{})
 	if err != nil {
 		log.Fatal(err)
 	}

server/conn.go

@@ -39,26 +39,38 @@ type Conn struct {
 var baseConnID uint32 = 10000
 
 // NewConn: create connection with default server settings
+// Deprecated: Use Server.NewConn instead.
 func NewConn(conn net.Conn, user string, password string, h Handler) (*Conn, error) {
+	s := NewDefaultServer()
+	return s.NewConn(conn, user, password, h)
+}
+
+// NewCustomizedConn: create connection with customized server settings
+// Deprecated: Use Server.NewConn instead.
+func NewCustomizedConn(conn net.Conn, serverConf *Server, p CredentialProvider, h Handler) (*Conn, error) {
+	return serverConf.NewCustomizedConn(conn, p, h)
+}
+
+// NewConn: create connection with default server settings
+func (s *Server) NewConn(conn net.Conn, user string, password string, h Handler) (*Conn, error) {
 	p := NewInMemoryProvider()
 	p.AddUser(user, password)
-	server := NewDefaultServer()
 
-	return NewCustomizedConn(conn, server, p, h)
+	return s.NewCustomizedConn(conn, p, h)
 }
 
 // NewCustomizedConn: create connection with customized server settings
-func NewCustomizedConn(conn net.Conn, serverConf *Server, p CredentialProvider, h Handler) (*Conn, error) {
+func (s *Server) NewCustomizedConn(conn net.Conn, p CredentialProvider, h Handler) (*Conn, error) {
 	var packetConn *packet.Conn
-	if serverConf.tlsConfig != nil {
+	if s.tlsConfig != nil {
 		packetConn = packet.NewTLSConn(conn)
 	} else {
 		packetConn = packet.NewConn(conn)
 	}
 
 	c := &Conn{
 		Conn:               packetConn,
-		serverConf:         serverConf,
+		serverConf:         s,
 		credentialProvider: p,
 		h:                  h,
 		connectionID:       atomic.AddUint32(&baseConnID, 1),