From ce4a60baa8562f93fd74c389fffb28a0ada220e2 Mon Sep 17 00:00:00 2001 From: quobix Date: Wed, 1 Nov 2023 15:15:46 -0400 Subject: [PATCH] cleaning up the last few stragglers Signed-off-by: quobix --- datamodel/low/extraction_functions.go | 5 ----- document.go | 6 +----- index/resolver.go | 4 ---- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/datamodel/low/extraction_functions.go b/datamodel/low/extraction_functions.go index 4bcefbd..33966ee 100644 --- a/datamodel/low/extraction_functions.go +++ b/datamodel/low/extraction_functions.go @@ -530,10 +530,6 @@ func ExtractMapNoLookupExtensions[PT Buildable[N], N any]( } } } - if foundIndex == nil { - foundIndex = idx - } - var n PT = new(N) err := BuildModel(node, n) if err != nil { @@ -553,7 +549,6 @@ func ExtractMapNoLookupExtensions[PT Buildable[N], N any]( }] = ValueReference[PT]{ Value: n, ValueNode: node, - //IsReference: isReference, Reference: referenceValue, } } diff --git a/document.go b/document.go index fc3c49c..8f2a395 100644 --- a/document.go +++ b/document.go @@ -370,11 +370,7 @@ func CompareDocuments(original, updated Document) (*model.DocumentChanges, []err if len(uErrs) > 0 { errs = append(errs, uErrs...) } - if v2ModelLeft != nil && v2ModelRight != nil { - return what_changed.CompareSwaggerDocuments(v2ModelLeft.Model.GoLow(), v2ModelRight.Model.GoLow()), errs - } else { - return nil, errs - } + return what_changed.CompareSwaggerDocuments(v2ModelLeft.Model.GoLow(), v2ModelRight.Model.GoLow()), errs } return nil, []error{fmt.Errorf("unable to compare documents, one or both documents are not of the same version")} } diff --git a/index/resolver.go b/index/resolver.go index 6c5b361..badd975 100644 --- a/index/resolver.go +++ b/index/resolver.go @@ -335,10 +335,6 @@ func (resolver *Resolver) isInfiniteCircularDependency(ref *Reference, visitedDe if initialRef != nil && initialRef.Definition == r.Definition { return true, visitedDefinitions } - - if visitedDefinitions[r.Definition] { - continue - } visitedDefinitions[r.Definition] = true ir := initialRef