refactor(conf): upgrade barky

Author: lvan100

conf/conf.go

@@ -133,7 +133,6 @@ import (
 	"github.com/go-spring/spring-core/conf/reader/prop"
 	"github.com/go-spring/spring-core/conf/reader/toml"
 	"github.com/go-spring/spring-core/conf/reader/yaml"
-	"github.com/go-spring/spring-core/util"
 	"github.com/spf13/cast"
 )
 
@@ -248,15 +247,15 @@ func Load(file string) (*MutableProperties, error) {
 		return nil, err
 	}
 	p := New()
-	_ = p.merge(util.FlattenMap(m), file)
+	_ = p.merge(barky.FlattenMap(m), file)
 	return p, nil
 }
 
 // Map creates *MutableProperties from map.
 func Map(m map[string]any) *MutableProperties {
 	p := New()
 	_, file, _, _ := runtime.Caller(1)
-	_ = p.merge(util.FlattenMap(m), file)
+	_ = p.merge(barky.FlattenMap(m), file)
 	return p
 }
 
@@ -271,29 +270,6 @@ func (p *MutableProperties) merge(m map[string]string, file string) error {
 	return nil
 }
 
-// Data returns key-value pairs of the properties.
-func (p *MutableProperties) Data() map[string]string {
-	m := make(map[string]string)
-	for k, v := range p.RawData() {
-		m[k] = v.Value
-	}
-	return m
-}
-
-// Keys returns keys of the properties.
-func (p *MutableProperties) Keys() []string {
-	return util.OrderedMapKeys(p.RawData())
-}
-
-// Get returns key's value, using Def to return a default value.
-func (p *MutableProperties) Get(key string, def ...string) string {
-	v, ok := p.RawData()[key]
-	if !ok && len(def) > 0 {
-		return def[0]
-	}
-	return v.Value
-}
-
 // Resolve resolves string value that contains references to other
 // properties, the references are defined by ${key:=def}.
 func (p *MutableProperties) Resolve(s string) (string, error) {

go.mod

@@ -4,7 +4,7 @@ go 1.24
 
 require (
 	github.com/expr-lang/expr v1.17.5
-	github.com/go-spring/barky v1.0.2
+	github.com/go-spring/barky v1.0.3
 	github.com/go-spring/gs-assert v1.0.2
 	github.com/go-spring/gs-mock v0.0.4
 	github.com/go-spring/log v0.0.5

go.sum

@@ -2,8 +2,8 @@ github.com/expr-lang/expr v1.17.5 h1:i1WrMvcdLF249nSNlpQZN1S6NXuW9WaOfF5tPi3aw3k
 github.com/expr-lang/expr v1.17.5/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/go-spring/barky v1.0.2 h1:HZuoFKrZMDg4ILwxwNfrAToU2zY1I3y05GfNiO5RXVc=
-github.com/go-spring/barky v1.0.2/go.mod h1:O6b8NWXMhKNA7D0zYbKN/62OcZGb/aSOaPihkKPU23k=
+github.com/go-spring/barky v1.0.3 h1:24U2IX47es7JfuAx7WkkOqBEV0bOy49/ZW4GCkVvD7Q=
+github.com/go-spring/barky v1.0.3/go.mod h1:IlEMJj9d//EQs2oin0tuGKGACslZe73khbHcDPzF9KE=
 github.com/go-spring/gs-assert v1.0.2 h1:9vDppl7ZwMvQE4c83ac7GzN0VxZC5BrQue7dND7NclQ=
 github.com/go-spring/gs-assert v1.0.2/go.mod h1:FfibkqWz4HUBpbig1cKMlzW8Ha7RywTB93f1Q/NuF9I=
 github.com/go-spring/gs-mock v0.0.4 h1:f34YN+ntXflfn13aLa3ZVCB78IG7wWZGK4y5tB+OGpI=

gs/internal/gs_dync/dync.go

@@ -67,8 +67,8 @@ import (
 	"sync"
 	"sync/atomic"
 
+	"github.com/go-spring/barky"
 	"github.com/go-spring/spring-core/conf"
-	"github.com/go-spring/spring-core/util"
 )
 
 // refreshable represents an object that can be dynamically refreshed.
@@ -209,7 +209,7 @@ func (p *Properties) Refresh(prop conf.Properties) (err error) {
 		changes[k] = struct{}{}
 	}
 
-	keys := util.OrderedMapKeys(changes)
+	keys := barky.OrderedMapKeys(changes)
 	return p.refreshKeys(keys)
 }
 
@@ -233,7 +233,7 @@ func (p *Properties) refreshKeys(keys []string) (err error) {
 	// Sort and collect objects that need updating.
 	updateObjects := make([]*refreshObject, 0, len(updateIndexes))
 	{
-		ints := util.OrderedMapKeys(updateIndexes)
+		ints := barky.OrderedMapKeys(updateIndexes)
 		for _, k := range ints {
 			updateObjects = append(updateObjects, updateIndexes[k])
 		}