LukeParke/libopenapi
1
0
Fork 0
mirror of https://github.com/LukeHagar/libopenapi.git synced 2025-12-06 12:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: clean up interfaces

Browse Source
This commit is contained in:
Tristan Cartledge
2023-12-02 22:22:43 +00:00
parent 137db075d8
commit b419d95c6b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
orderedmap/builder.go
View File

@@ -9,7 +9,7 @@ import (
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
type Marshaler interface { type marshaler interface {
MarshalYAML() (interface{}, error) MarshalYAML() (interface{}, error)
} }
@@ -21,19 +21,19 @@ type MapToYamlNoder interface {
ToYamlNode(n NodeBuilder, l any) *yaml.Node ToYamlNode(n NodeBuilder, l any) *yaml.Node
} }
type HasKeyNode interface { type hasKeyNode interface {
GetKeyNode() *yaml.Node GetKeyNode() *yaml.Node
} }
type HasValueNode interface { type hasValueNode interface {
GetValueNode() *yaml.Node GetValueNode() *yaml.Node
} }
type HasValueUntyped interface { type hasValueUntyped interface {
GetValueUntyped() any GetValueUntyped() any
} }
type FindValueUntyped interface { type findValueUntyped interface {
FindValueUntyped(k string) any FindValueUntyped(k string) any
} }
@@ -44,7 +44,7 @@ func (o *Map[K, V]) ToYamlNode(n NodeBuilder, l any) *yaml.Node {
i := 99999 i := 99999
if l != nil { if l != nil {
if hvn, ok := l.(HasValueNode); ok { if hvn, ok := l.(hasValueNode); ok {
vn = hvn.GetValueNode() vn = hvn.GetValueNode()
if vn != nil && len(vn.Content) > 0 { if vn != nil && len(vn.Content) > 0 {
i = vn.Content[0].Line i = vn.Content[0].Line
@@ -54,7 +54,7 @@ func (o *Map[K, V]) ToYamlNode(n NodeBuilder, l any) *yaml.Node {
for pair := First(o); pair != nil; pair = pair.Next() { for pair := First(o); pair != nil; pair = pair.Next() {
var k any = pair.Key() var k any = pair.Key()
if m, ok := k.(Marshaler); ok { // TODO marshal inline? if m, ok := k.(marshaler); ok { // TODO marshal inline?
k, _ = m.MarshalYAML() k, _ = m.MarshalYAML()
} }
@@ -78,9 +78,9 @@ func (o *Map[K, V]) ToYamlNode(n NodeBuilder, l any) *yaml.Node {
var lv any var lv any
if l != nil { if l != nil {
if hvut, ok := l.(HasValueUntyped); ok { if hvut, ok := l.(hasValueUntyped); ok {
vut := hvut.GetValueUntyped() vut := hvut.GetValueUntyped()
if m, ok := vut.(FindValueUntyped); ok { if m, ok := vut.(findValueUntyped); ok {
lv = m.FindValueUntyped(ks) lv = m.FindValueUntyped(ks)
} }
} }
@@ -116,7 +116,7 @@ func findKeyNode(key string, m *yaml.Node) *yaml.Node {
func (o *Map[K, V]) FindValueUntyped(key string) any { func (o *Map[K, V]) FindValueUntyped(key string) any {
for pair := First(o); pair != nil; pair = pair.Next() { for pair := First(o); pair != nil; pair = pair.Next() {
var k any = pair.Key() var k any = pair.Key()
if hvut, ok := k.(HasValueUntyped); ok { if hvut, ok := k.(hasValueUntyped); ok {
if fmt.Sprintf("%v", hvut.GetValueUntyped()) == key { if fmt.Sprintf("%v", hvut.GetValueUntyped()) == key {
return pair.Value() return pair.Value()
} }