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

chore: update to use iterators on orderedmaps

Browse Source
This commit is contained in:
Tristan Cartledge
2024-08-14 12:10:07 +01:00
committed by quobix
parent c3eb16d4e4
commit 161a41f73b
73 changed files with 690 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
datamodel/low/base/schema.go
View File

@@ -262,9 +262,7 @@ func (s *Schema) Hash() [32]byte {
sort.Strings(keys)
d = append(d, keys...)
for pair := orderedmap.First(orderedmap.SortAlpha(s.Properties.Value)); pair != nil; pair = pair.Next() {
d = append(d, fmt.Sprintf("%s-%s", pair.Key().Value, low.GenerateHashString(pair.Value().Value)))
}
d = low.AppendMapHashes(d, s.Properties.Value)
if s.XML.Value != nil {
d = append(d, low.GenerateHashString(s.XML.Value))
}
@@ -364,13 +362,8 @@ func (s *Schema) Hash() [32]byte {
d = append(d, fmt.Sprint(s.Anchor.Value))
}
for pair := orderedmap.First(orderedmap.SortAlpha(s.DependentSchemas.Value)); pair != nil; pair = pair.Next() {
d = append(d, fmt.Sprintf("%s-%s", pair.Key().Value, low.GenerateHashString(pair.Value().Value)))
}
for pair := orderedmap.First(orderedmap.SortAlpha(s.PatternProperties.Value)); pair != nil; pair = pair.Next() {
d = append(d, fmt.Sprintf("%s-%s", pair.Key().Value, low.GenerateHashString(pair.Value().Value)))
}
d = low.AppendMapHashes(d, orderedmap.SortAlpha(s.DependentSchemas.Value))
d = low.AppendMapHashes(d, orderedmap.SortAlpha(s.PatternProperties.Value))
if len(s.PrefixItems.Value) > 0 {
itemsKeys := make([]string, len(s.PrefixItems.Value))
@@ -1180,7 +1173,6 @@ func buildSchema(ctx context.Context, schemas chan schemaProxyBuildResult, label
res: res,
idx: schemaIdx,
}
}
isRef := false