remove config API's context parameter

core/config/yaml/yaml.go

@@ -31,7 +31,6 @@ package yaml
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -41,10 +40,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/astaxie/beego/core/config"
-	"github.com/astaxie/beego/core/logs"
 	"github.com/beego/goyaml2"
 	"gopkg.in/yaml.v2"
+
+	"github.com/astaxie/beego/core/config"
+	"github.com/astaxie/beego/core/logs"
 )
 
 // Config is a yaml config parser and implements Config interface.
@@ -126,8 +126,8 @@ type ConfigContainer struct {
 }
 
 // Unmarshaler is similar to Sub
-func (c *ConfigContainer) Unmarshaler(ctx context.Context, prefix string, obj interface{}, opt ...config.DecodeOption) error {
-	sub, err := c.sub(ctx, prefix)
+func (c *ConfigContainer) Unmarshaler(prefix string, obj interface{}, opt ...config.DecodeOption) error {
+	sub, err := c.sub(prefix)
 	if err != nil {
 		return err
 	}
@@ -139,8 +139,8 @@ func (c *ConfigContainer) Unmarshaler(ctx context.Context, prefix string, obj in
 	return yaml.Unmarshal(bytes, obj)
 }
 
-func (c *ConfigContainer) Sub(ctx context.Context, key string) (config.Configer, error) {
-	sub, err := c.sub(ctx, key)
+func (c *ConfigContainer) Sub(key string) (config.Configer, error) {
+	sub, err := c.sub(key)
 	if err != nil {
 		return nil, err
 	}
@@ -149,7 +149,7 @@ func (c *ConfigContainer) Sub(ctx context.Context, key string) (config.Configer,
 	}, nil
 }
 
-func (c *ConfigContainer) sub(ctx context.Context, key string) (map[string]interface{}, error) {
+func (c *ConfigContainer) sub(key string) (map[string]interface{}, error) {
 	tmpData := c.data
 	keys := strings.Split(key, ".")
 	for idx, k := range keys {
@@ -171,13 +171,13 @@ func (c *ConfigContainer) sub(ctx context.Context, key string) (map[string]inter
 	return tmpData, nil
 }
 
-func (c *ConfigContainer) OnChange(ctx context.Context, key string, fn func(value string)) {
+func (c *ConfigContainer) OnChange(key string, fn func(value string)) {
 	// do nothing
 	logs.Warn("Unsupported operation: OnChange")
 }
 
 // Bool returns the boolean value for a given key.
-func (c *ConfigContainer) Bool(ctx context.Context, key string) (bool, error) {
+func (c *ConfigContainer) Bool(key string) (bool, error) {
 	v, err := c.getData(key)
 	if err != nil {
 		return false, err
@@ -187,8 +187,8 @@ func (c *ConfigContainer) Bool(ctx context.Context, key string) (bool, error) {
 
 // DefaultBool return the bool value if has no error
 // otherwise return the defaultVal
-func (c *ConfigContainer) DefaultBool(ctx context.Context, key string, defaultVal bool) bool {
-	v, err := c.Bool(ctx, key)
+func (c *ConfigContainer) DefaultBool(key string, defaultVal bool) bool {
+	v, err := c.Bool(key)
 	if err != nil {
 		return defaultVal
 	}
@@ -196,7 +196,7 @@ func (c *ConfigContainer) DefaultBool(ctx context.Context, key string, defaultVa
 }
 
 // Int returns the integer value for a given key.
-func (c *ConfigContainer) Int(ctx context.Context, key string) (int, error) {
+func (c *ConfigContainer) Int(key string) (int, error) {
 	if v, err := c.getData(key); err != nil {
 		return 0, err
 	} else if vv, ok := v.(int); ok {
@@ -209,8 +209,8 @@ func (c *ConfigContainer) Int(ctx context.Context, key string) (int, error) {
 
 // DefaultInt returns the integer value for a given key.
 // if err != nil return defaultVal
-func (c *ConfigContainer) DefaultInt(ctx context.Context, key string, defaultVal int) int {
-	v, err := c.Int(ctx, key)
+func (c *ConfigContainer) DefaultInt(key string, defaultVal int) int {
+	v, err := c.Int(key)
 	if err != nil {
 		return defaultVal
 	}
@@ -218,7 +218,7 @@ func (c *ConfigContainer) DefaultInt(ctx context.Context, key string, defaultVal
 }
 
 // Int64 returns the int64 value for a given key.
-func (c *ConfigContainer) Int64(ctx context.Context, key string) (int64, error) {
+func (c *ConfigContainer) Int64(key string) (int64, error) {
 	if v, err := c.getData(key); err != nil {
 		return 0, err
 	} else if vv, ok := v.(int64); ok {
@@ -229,8 +229,8 @@ func (c *ConfigContainer) Int64(ctx context.Context, key string) (int64, error)
 
 // DefaultInt64 returns the int64 value for a given key.
 // if err != nil return defaultVal
-func (c *ConfigContainer) DefaultInt64(ctx context.Context, key string, defaultVal int64) int64 {
-	v, err := c.Int64(ctx, key)
+func (c *ConfigContainer) DefaultInt64(key string, defaultVal int64) int64 {
+	v, err := c.Int64(key)
 	if err != nil {
 		return defaultVal
 	}
@@ -238,7 +238,7 @@ func (c *ConfigContainer) DefaultInt64(ctx context.Context, key string, defaultV
 }
 
 // Float returns the float value for a given key.
-func (c *ConfigContainer) Float(ctx context.Context, key string) (float64, error) {
+func (c *ConfigContainer) Float(key string) (float64, error) {
 	if v, err := c.getData(key); err != nil {
 		return 0.0, err
 	} else if vv, ok := v.(float64); ok {
@@ -253,8 +253,8 @@ func (c *ConfigContainer) Float(ctx context.Context, key string) (float64, error
 
 // DefaultFloat returns the float64 value for a given key.
 // if err != nil return defaultVal
-func (c *ConfigContainer) DefaultFloat(ctx context.Context, key string, defaultVal float64) float64 {
-	v, err := c.Float(ctx, key)
+func (c *ConfigContainer) DefaultFloat(key string, defaultVal float64) float64 {
+	v, err := c.Float(key)
 	if err != nil {
 		return defaultVal
 	}
@@ -262,7 +262,7 @@ func (c *ConfigContainer) DefaultFloat(ctx context.Context, key string, defaultV
 }
 
 // String returns the string value for a given key.
-func (c *ConfigContainer) String(ctx context.Context, key string) (string, error) {
+func (c *ConfigContainer) String(key string) (string, error) {
 	if v, err := c.getData(key); err == nil {
 		if vv, ok := v.(string); ok {
 			return vv, nil
@@ -273,8 +273,8 @@ func (c *ConfigContainer) String(ctx context.Context, key string) (string, error
 
 // DefaultString returns the string value for a given key.
 // if err != nil return defaultVal
-func (c *ConfigContainer) DefaultString(ctx context.Context, key string, defaultVal string) string {
-	v, err := c.String(nil, key)
+func (c *ConfigContainer) DefaultString(key string, defaultVal string) string {
+	v, err := c.String(key)
 	if v == "" || err != nil {
 		return defaultVal
 	}
@@ -282,8 +282,8 @@ func (c *ConfigContainer) DefaultString(ctx context.Context, key string, default
 }
 
 // Strings returns the []string value for a given key.
-func (c *ConfigContainer) Strings(ctx context.Context, key string) ([]string, error) {
-	v, err := c.String(nil, key)
+func (c *ConfigContainer) Strings(key string) ([]string, error) {
+	v, err := c.String(key)
 	if v == "" || err != nil {
 		return nil, err
 	}
@@ -292,8 +292,8 @@ func (c *ConfigContainer) Strings(ctx context.Context, key string) ([]string, er
 
 // DefaultStrings returns the []string value for a given key.
 // if err != nil return defaultVal
-func (c *ConfigContainer) DefaultStrings(ctx context.Context, key string, defaultVal []string) []string {
-	v, err := c.Strings(ctx, key)
+func (c *ConfigContainer) DefaultStrings(key string, defaultVal []string) []string {
+	v, err := c.Strings(key)
 	if v == nil || err != nil {
 		return defaultVal
 	}
@@ -301,7 +301,7 @@ func (c *ConfigContainer) DefaultStrings(ctx context.Context, key string, defaul
 }
 
 // GetSection returns map for the given section
-func (c *ConfigContainer) GetSection(ctx context.Context, section string) (map[string]string, error) {
+func (c *ConfigContainer) GetSection(section string) (map[string]string, error) {
 
 	if v, ok := c.data[section]; ok {
 		return v.(map[string]string), nil
@@ -310,7 +310,7 @@ func (c *ConfigContainer) GetSection(ctx context.Context, section string) (map[s
 }
 
 // SaveConfigFile save the config into file
-func (c *ConfigContainer) SaveConfigFile(ctx context.Context, filename string) (err error) {
+func (c *ConfigContainer) SaveConfigFile(filename string) (err error) {
 	// Write configuration file by filename.
 	f, err := os.Create(filename)
 	if err != nil {
@@ -322,7 +322,7 @@ func (c *ConfigContainer) SaveConfigFile(ctx context.Context, filename string) (
 }
 
 // Set writes a new value for key.
-func (c *ConfigContainer) Set(ctx context.Context, key, val string) error {
+func (c *ConfigContainer) Set(key, val string) error {
 	c.Lock()
 	defer c.Unlock()
 	c.data[key] = val
@@ -330,7 +330,7 @@ func (c *ConfigContainer) Set(ctx context.Context, key, val string) error {
 }
 
 // DIY returns the raw value by a given key.
-func (c *ConfigContainer) DIY(ctx context.Context, key string) (v interface{}, err error) {
+func (c *ConfigContainer) DIY(key string) (v interface{}, err error) {
 	return c.getData(key)
 }
 

core/config/yaml/yaml_test.go

@@ -15,7 +15,6 @@
 package yaml
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"testing"
@@ -76,7 +75,7 @@ func TestYaml(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	res, _ := yamlconf.String(nil, "appname")
+	res, _ := yamlconf.String("appname")
 	if res != "beeapi" {
 		t.Fatal("appname not equal to beeapi")
 	}
@@ -90,19 +89,19 @@ func TestYaml(t *testing.T) {
 
 		switch v.(type) {
 		case int:
-			value, err = yamlconf.Int(nil, k)
+			value, err = yamlconf.Int(k)
 		case int64:
-			value, err = yamlconf.Int64(nil, k)
+			value, err = yamlconf.Int64(k)
 		case float64:
-			value, err = yamlconf.Float(nil, k)
+			value, err = yamlconf.Float(k)
 		case bool:
-			value, err = yamlconf.Bool(nil, k)
+			value, err = yamlconf.Bool(k)
 		case []string:
-			value, err = yamlconf.Strings(nil, k)
+			value, err = yamlconf.Strings(k)
 		case string:
-			value, err = yamlconf.String(nil, k)
+			value, err = yamlconf.String(k)
 		default:
-			value, err = yamlconf.DIY(nil, k)
+			value, err = yamlconf.DIY(k)
 		}
 		if err != nil {
 			t.Errorf("get key %q value fatal,%v err %s", k, v, err)
@@ -112,35 +111,35 @@ func TestYaml(t *testing.T) {
 
 	}
 
-	if err = yamlconf.Set(nil, "name", "astaxie"); err != nil {
+	if err = yamlconf.Set("name", "astaxie"); err != nil {
 		t.Fatal(err)
 	}
-	res, _ = yamlconf.String(nil, "name")
+	res, _ = yamlconf.String("name")
 	if res != "astaxie" {
 		t.Fatal("get name error")
 	}
 
-	sub, err := yamlconf.Sub(context.Background(), "user")
+	sub, err := yamlconf.Sub("user")
 	assert.Nil(t, err)
 	assert.NotNil(t, sub)
-	name, err := sub.String(context.Background(), "name")
+	name, err := sub.String("name")
 	assert.Nil(t, err)
 	assert.Equal(t, "tom", name)
 
-	age, err := sub.Int(context.Background(), "age")
+	age, err := sub.Int("age")
 	assert.Nil(t, err)
 	assert.Equal(t, 13, age)
 
 	user := &User{}
 
-	err = sub.Unmarshaler(context.Background(), "", user)
+	err = sub.Unmarshaler("", user)
 	assert.Nil(t, err)
 	assert.Equal(t, "tom", user.Name)
 	assert.Equal(t, 13, user.Age)
 
 	user = &User{}
 
-	err = yamlconf.Unmarshaler(context.Background(), "user", user)
+	err = yamlconf.Unmarshaler("user", user)
 	assert.Nil(t, err)
 	assert.Equal(t, "tom", user.Name)
 	assert.Equal(t, 13, user.Age)