mirror of
https://github.com/LukeHagar/libopenapi.git
synced 2025-12-10 12:37:48 +00:00
Added support for unevaluatedProperties as Schema and bool #118
Also ran `gofmt` across the entire project. Things need cleaning up. Signed-off-by: Dave Shanley <dave@quobix.com>
This commit is contained in:
@@ -4,79 +4,79 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"github.com/pb33f/libopenapi/datamodel/low"
|
||||
"github.com/pb33f/libopenapi/datamodel/low/v3"
|
||||
"github.com/pb33f/libopenapi/datamodel/low"
|
||||
"github.com/pb33f/libopenapi/datamodel/low/v3"
|
||||
)
|
||||
|
||||
// ServerVariableChanges represents changes found between two OpenAPI ServerVariable Objects
|
||||
type ServerVariableChanges struct {
|
||||
*PropertyChanges
|
||||
*PropertyChanges
|
||||
}
|
||||
|
||||
// GetAllChanges returns a slice of all changes made between SecurityRequirement objects
|
||||
func (s *ServerVariableChanges) GetAllChanges() []*Change {
|
||||
return s.Changes
|
||||
return s.Changes
|
||||
}
|
||||
|
||||
// CompareServerVariables compares a left and right OpenAPI ServerVariable object for changes.
|
||||
// If anything is found, returns a pointer to a ServerVariableChanges instance, otherwise returns nil.
|
||||
func CompareServerVariables(l, r *v3.ServerVariable) *ServerVariableChanges {
|
||||
if low.AreEqual(l, r) {
|
||||
return nil
|
||||
}
|
||||
if low.AreEqual(l, r) {
|
||||
return nil
|
||||
}
|
||||
|
||||
var props []*PropertyCheck
|
||||
var changes []*Change
|
||||
var props []*PropertyCheck
|
||||
var changes []*Change
|
||||
|
||||
lValues := make(map[string]low.NodeReference[string])
|
||||
rValues := make(map[string]low.NodeReference[string])
|
||||
for i := range l.Enum {
|
||||
lValues[l.Enum[i].Value] = l.Enum[i]
|
||||
}
|
||||
for i := range r.Enum {
|
||||
rValues[r.Enum[i].Value] = r.Enum[i]
|
||||
}
|
||||
for k := range lValues {
|
||||
if _, ok := rValues[k]; !ok {
|
||||
CreateChange(&changes, ObjectRemoved, v3.EnumLabel,
|
||||
lValues[k].ValueNode, nil, true,
|
||||
lValues[k].Value, nil)
|
||||
continue
|
||||
}
|
||||
}
|
||||
for k := range rValues {
|
||||
if _, ok := lValues[k]; !ok {
|
||||
CreateChange(&changes, ObjectAdded, v3.EnumLabel,
|
||||
lValues[k].ValueNode, rValues[k].ValueNode, false,
|
||||
lValues[k].Value, rValues[k].Value)
|
||||
}
|
||||
}
|
||||
lValues := make(map[string]low.NodeReference[string])
|
||||
rValues := make(map[string]low.NodeReference[string])
|
||||
for i := range l.Enum {
|
||||
lValues[l.Enum[i].Value] = l.Enum[i]
|
||||
}
|
||||
for i := range r.Enum {
|
||||
rValues[r.Enum[i].Value] = r.Enum[i]
|
||||
}
|
||||
for k := range lValues {
|
||||
if _, ok := rValues[k]; !ok {
|
||||
CreateChange(&changes, ObjectRemoved, v3.EnumLabel,
|
||||
lValues[k].ValueNode, nil, true,
|
||||
lValues[k].Value, nil)
|
||||
continue
|
||||
}
|
||||
}
|
||||
for k := range rValues {
|
||||
if _, ok := lValues[k]; !ok {
|
||||
CreateChange(&changes, ObjectAdded, v3.EnumLabel,
|
||||
lValues[k].ValueNode, rValues[k].ValueNode, false,
|
||||
lValues[k].Value, rValues[k].Value)
|
||||
}
|
||||
}
|
||||
|
||||
// default
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.Default.ValueNode,
|
||||
RightNode: r.Default.ValueNode,
|
||||
Label: v3.DefaultLabel,
|
||||
Changes: &changes,
|
||||
Breaking: true,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
// default
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.Default.ValueNode,
|
||||
RightNode: r.Default.ValueNode,
|
||||
Label: v3.DefaultLabel,
|
||||
Changes: &changes,
|
||||
Breaking: true,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
|
||||
// description
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.Description.ValueNode,
|
||||
RightNode: r.Description.ValueNode,
|
||||
Label: v3.DescriptionLabel,
|
||||
Changes: &changes,
|
||||
Breaking: false,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
// description
|
||||
props = append(props, &PropertyCheck{
|
||||
LeftNode: l.Description.ValueNode,
|
||||
RightNode: r.Description.ValueNode,
|
||||
Label: v3.DescriptionLabel,
|
||||
Changes: &changes,
|
||||
Breaking: false,
|
||||
Original: l,
|
||||
New: r,
|
||||
})
|
||||
|
||||
// check everything.
|
||||
CheckProperties(props)
|
||||
sc := new(ServerVariableChanges)
|
||||
sc.PropertyChanges = NewPropertyChanges(changes)
|
||||
return sc
|
||||
// check everything.
|
||||
CheckProperties(props)
|
||||
sc := new(ServerVariableChanges)
|
||||
sc.PropertyChanges = NewPropertyChanges(changes)
|
||||
return sc
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user