fix: continued moving everything to orderedmaps plus cleaned up most the tests

This commit is contained in:
Tristan Cartledge
2023-12-01 17:37:07 +00:00
parent 0f3d0cb28f
commit a4ad09aab3
169 changed files with 3435 additions and 3764 deletions

View File

@@ -6,8 +6,6 @@ package v3
import (
"context"
"crypto/sha256"
"fmt"
"sort"
"strings"
"github.com/pb33f/libopenapi/orderedmap"
@@ -26,19 +24,19 @@ import (
// that identifies a URL to use for the callback operation.
// - https://spec.openapis.org/oas/v3.1.0#callback-object
type Callback struct {
Expression low.ValueReference[orderedmap.Map[low.KeyReference[string], low.ValueReference[*PathItem]]]
Extensions map[low.KeyReference[string]]low.ValueReference[any]
Expression *orderedmap.Map[low.KeyReference[string], low.ValueReference[*PathItem]]
Extensions *orderedmap.Map[low.KeyReference[string], low.ValueReference[*yaml.Node]]
*low.Reference
}
// GetExtensions returns all Callback extensions and satisfies the low.HasExtensions interface.
func (cb *Callback) GetExtensions() map[low.KeyReference[string]]low.ValueReference[any] {
func (cb *Callback) GetExtensions() *orderedmap.Map[low.KeyReference[string], low.ValueReference[*yaml.Node]] {
return cb.Extensions
}
// FindExpression will locate a string expression and return a ValueReference containing the located PathItem
func (cb *Callback) FindExpression(exp string) *low.ValueReference[*PathItem] {
return low.FindItemInOrderedMap[*PathItem](exp, cb.Expression.Value)
return low.FindItemInOrderedMap(exp, cb.Expression)
}
// Build will extract extensions, expressions and PathItem objects for Callback
@@ -48,64 +46,22 @@ func (cb *Callback) Build(ctx context.Context, _, root *yaml.Node, idx *index.Sp
cb.Reference = new(low.Reference)
cb.Extensions = low.ExtractExtensions(root)
// handle callback
var currentCB *yaml.Node
callbacks := orderedmap.New[low.KeyReference[string], low.ValueReference[*PathItem]]()
expressions, err := extractPathItemsMap(ctx, root, idx)
if err != nil {
return err
}
cb.Expression = expressions
for i, callbackNode := range root.Content {
if i%2 == 0 {
currentCB = callbackNode
continue
}
if strings.HasPrefix(currentCB.Value, "x-") {
continue // ignore extension.
}
callback, eErr, _, rv := low.ExtractObjectRaw[*PathItem](ctx, currentCB, callbackNode, idx)
if eErr != nil {
return eErr
}
callbacks.Set(
low.KeyReference[string]{
Value: currentCB.Value,
KeyNode: currentCB,
},
low.ValueReference[*PathItem]{
Value: callback,
ValueNode: callbackNode,
Reference: rv,
},
)
}
if orderedmap.Len(callbacks) > 0 {
cb.Expression = low.ValueReference[orderedmap.Map[low.KeyReference[string], low.ValueReference[*PathItem]]]{
Value: callbacks,
ValueNode: root,
}
}
return nil
}
// Hash will return a consistent SHA256 Hash of the Callback object
func (cb *Callback) Hash() [32]byte {
var f []string
var keys []string
keys = make([]string, orderedmap.Len(cb.Expression.Value))
z := 0
for pair := orderedmap.First(cb.Expression.Value); pair != nil; pair = pair.Next() {
keys[z] = low.GenerateHashString(pair.Value().Value)
z++
for pair := orderedmap.First(orderedmap.SortAlpha(cb.Expression)); pair != nil; pair = pair.Next() {
f = append(f, low.GenerateHashString(pair.Value().Value))
}
sort.Strings(keys)
f = append(f, keys...)
keys = make([]string, len(cb.Extensions))
z = 0
for k := range cb.Extensions {
keys[z] = fmt.Sprintf("%s-%x", k.Value, sha256.Sum256([]byte(fmt.Sprint(cb.Extensions[k].Value))))
z++
}
sort.Strings(keys)
f = append(f, keys...)
f = append(f, low.HashExtensions(cb.Extensions)...)
return sha256.Sum256([]byte(strings.Join(f, "|")))
}