mirror
/
viper
mirror of https://github.com/spf13/viper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

refactor(encoding): drop old codec registries 

Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
This commit is contained in:
Mark Sagi-Kazar 2024-06-24 11:50:38 +02:00 committed by Márk Sági-Kazár
parent 2a1765daf8
commit a7f64b7f25
1 changed files with 0 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
viper.go
View File

@ -40,14 +40,7 @@ import (
"github.com/spf13/cast" "github.com/spf13/cast"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"github.com/spf13/viper/internal/encoding"
"github.com/spf13/viper/internal/encoding/dotenv"
"github.com/spf13/viper/internal/encoding/hcl"
"github.com/spf13/viper/internal/encoding/ini" "github.com/spf13/viper/internal/encoding/ini"
"github.com/spf13/viper/internal/encoding/javaproperties"
"github.com/spf13/viper/internal/encoding/json"
"github.com/spf13/viper/internal/encoding/toml"
"github.com/spf13/viper/internal/encoding/yaml"
"github.com/spf13/viper/internal/features" "github.com/spf13/viper/internal/features"
) )
@ -191,10 +184,6 @@ type Viper struct {
logger *slog.Logger logger *slog.Logger
// TODO: should probably be protected with a mutex
encoderRegistry *encoding.EncoderRegistry
decoderRegistry *encoding.DecoderRegistry
encoderRegistry2 EncoderRegistry encoderRegistry2 EncoderRegistry
decoderRegistry2 DecoderRegistry decoderRegistry2 DecoderRegistry
@ -225,8 +214,6 @@ func New() *Viper {
v.encoderRegistry2 = codecRegistry v.encoderRegistry2 = codecRegistry
v.decoderRegistry2 = codecRegistry v.decoderRegistry2 = codecRegistry
v.resetEncoding()
v.experimentalFinder = features.Finder v.experimentalFinder = features.Finder
v.experimentalBindStruct = features.BindStruct v.experimentalBindStruct = features.BindStruct
@ -276,8 +263,6 @@ func NewWithOptions(opts ...Option) *Viper {
opt.apply(v) opt.apply(v)
} }
v.resetEncoding()
return v return v
} }
@ -286,16 +271,9 @@ func NewWithOptions(opts ...Option) *Viper {
// Be careful when using this function: subsequent calls may override options you set. // Be careful when using this function: subsequent calls may override options you set.
// It's always better to use a local Viper instance. // It's always better to use a local Viper instance.
func SetOptions(opts ...Option) { func SetOptions(opts ...Option) {
keyDelim := v.keyDelim
for _, opt := range opts { for _, opt := range opts {
opt.apply(v) opt.apply(v)
} }
// reset encoding if key delimiter changed
if keyDelim != v.keyDelim {
v.resetEncoding()
}
} }
// Reset is intended for testing, will reset all to default settings. // Reset is intended for testing, will reset all to default settings.
@ -308,84 +286,6 @@ func Reset() {
resetRemote() resetRemote()
} }
// TODO: make this lazy initialization instead.
func (v *Viper) resetEncoding() {
encoderRegistry := encoding.NewEncoderRegistry()
decoderRegistry := encoding.NewDecoderRegistry()
{
codec := yaml.Codec{}
encoderRegistry.RegisterEncoder("yaml", codec)
decoderRegistry.RegisterDecoder("yaml", codec)
encoderRegistry.RegisterEncoder("yml", codec)
decoderRegistry.RegisterDecoder("yml", codec)
}
{
codec := json.Codec{}
encoderRegistry.RegisterEncoder("json", codec)
decoderRegistry.RegisterDecoder("json", codec)
}
{
codec := toml.Codec{}
encoderRegistry.RegisterEncoder("toml", codec)
decoderRegistry.RegisterDecoder("toml", codec)
}
{
codec := hcl.Codec{}
encoderRegistry.RegisterEncoder("hcl", codec)
decoderRegistry.RegisterDecoder("hcl", codec)
encoderRegistry.RegisterEncoder("tfvars", codec)
decoderRegistry.RegisterDecoder("tfvars", codec)
}
{
codec := ini.Codec{
KeyDelimiter: v.keyDelim,
LoadOptions: v.iniLoadOptions,
}
encoderRegistry.RegisterEncoder("ini", codec)
decoderRegistry.RegisterDecoder("ini", codec)
}
{
codec := &javaproperties.Codec{
KeyDelimiter: v.keyDelim,
}
encoderRegistry.RegisterEncoder("properties", codec)
decoderRegistry.RegisterDecoder("properties", codec)
encoderRegistry.RegisterEncoder("props", codec)
decoderRegistry.RegisterDecoder("props", codec)
encoderRegistry.RegisterEncoder("prop", codec)
decoderRegistry.RegisterDecoder("prop", codec)
}
{
codec := &dotenv.Codec{}
encoderRegistry.RegisterEncoder("dotenv", codec)
decoderRegistry.RegisterDecoder("dotenv", codec)
encoderRegistry.RegisterEncoder("env", codec)
decoderRegistry.RegisterDecoder("env", codec)
}
v.encoderRegistry = encoderRegistry
v.decoderRegistry = decoderRegistry
}
// SupportedExts are universally supported extensions. // SupportedExts are universally supported extensions.
var SupportedExts = []string{"json", "toml", "yaml", "yml", "properties", "props", "prop", "hcl", "tfvars", "dotenv", "env", "ini"} var SupportedExts = []string{"json", "toml", "yaml", "yml", "properties", "props", "prop", "hcl", "tfvars", "dotenv", "env", "ini"}