file

Author: myxy99

datasource/apollo/register.go

@@ -10,7 +10,13 @@ import (
 // DataSourceApollo defines apollo scheme
 const DataSourceApollo = "apollo"
 
-func Register() (string, func() xcfg.DataSource) {
+type apollo struct{}
+
+func New() *apollo {
+	return new(apollo)
+}
+
+func (e apollo) Register() (string, func() xcfg.DataSource) {
 	return DataSourceApollo, func() xcfg.DataSource {
 		var (
 			configAddr = xflag.String("xcfg")

datasource/etcdv3/register.go

@@ -12,7 +12,13 @@ import (
 // DataSourceEtcd defines etcd scheme
 const DataSourceEtcd = "etcd"
 
-func Register() (string, func() xcfg.DataSource) {
+type etcd struct{}
+
+func New() *etcd {
+	return new(etcd)
+}
+
+func (e etcd) Register() (string, func() xcfg.DataSource) {
 	return DataSourceEtcd, func() xcfg.DataSource {
 		var (
 			configAddr = xflag.String("xcfg")

datasource/file/register.go

@@ -8,7 +8,13 @@ import (
 // DataSourceFile defines file scheme
 const DataSourceFile = "file"
 
-func Register() (string, func() xcfg.DataSource) {
+type file struct{}
+
+func New() *file {
+	return new(file)
+}
+
+func (f file) Register() (string, func() xcfg.DataSource) {
 	return DataSourceFile, func() xcfg.DataSource {
 		var (
 			configAddr  = xflag.String("xcfg")

datasource/manager/manager.go

@@ -23,16 +23,25 @@ var (
 // DataSourceCreatorFunc represents a dataSource creator function
 type DataSourceCreatorFunc func() xcfg.DataSource
 
+type DataSource interface {
+	Register() (string, func() xcfg.DataSource)
+}
+
 func init() {
 	registry = make(map[string]DataSourceCreatorFunc)
-	Register(file.Register())
-	Register(etcdv3.Register())
-	Register(apollo.Register())
+	Register(
+		file.New(),
+		etcdv3.New(),
+		apollo.New(),
+	)
 }
 
 // Register registers a dataSource creator function to the registry
-func Register(scheme string, creator DataSourceCreatorFunc) {
-	registry[scheme] = creator
+func Register(data ...DataSource) {
+	for _, datum := range data {
+		name, f := datum.Register()
+		registry[name] = f
+	}
 }
 
 //NewDataSource ..