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

Bubble up circular reference errors

Browse Source
This commit is contained in:
Wouter Dullaert
2022-12-07 11:38:59 +01:00
committed by Dave Shanley
parent cbfb051a92
commit 4fcf45b813
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
document.go
View File

@@ -15,11 +15,13 @@ package libopenapi
import (
"fmt"
"github.com/pb33f/libopenapi/datamodel"
v2high "github.com/pb33f/libopenapi/datamodel/high/v2"
v3high "github.com/pb33f/libopenapi/datamodel/high/v3"
v2low "github.com/pb33f/libopenapi/datamodel/low/v2"
v3low "github.com/pb33f/libopenapi/datamodel/low/v3"
"github.com/pb33f/libopenapi/resolver"
"github.com/pb33f/libopenapi/utils"
what_changed "github.com/pb33f/libopenapi/what-changed"
"github.com/pb33f/libopenapi/what-changed/model"
@@ -116,14 +118,22 @@ func (d *document) BuildV2Model() (*DocumentModel[v2high.Swagger], []error) {
"supplied spec is a different version (%v). Try 'BuildV3Model()'", d.info.SpecFormat))
return nil, errors
}
lowDoc, err := v2low.CreateDocument(d.info)
if err != nil {
return nil, err
lowDoc, errs := v2low.CreateDocument(d.info)
// Do not shortcircuit on circular reference errors, so the client
// has the option of ignoring them.
for _, err := range errs {
if refErr, ok := err.(*resolver.ResolvingError); ok {
if refErr.CircularReference == nil {
return nil, errs
}
} else {
return nil, errs
}
}
highDoc := v2high.NewSwaggerDocument(lowDoc)
return &DocumentModel[v2high.Swagger]{
Model: *highDoc,
}, nil
}, errs
}
func (d *document) BuildV3Model() (*DocumentModel[v3high.Document], []error) {
@@ -137,14 +147,22 @@ func (d *document) BuildV3Model() (*DocumentModel[v3high.Document], []error) {
"supplied spec is a different version (%v). Try 'BuildV2Model()'", d.info.SpecFormat))
return nil, errors
}
lowDoc, err := v3low.CreateDocument(d.info)
if err != nil {
return nil, err
lowDoc, errs := v3low.CreateDocument(d.info)
// Do not shortcircuit on circular reference errors, so the client
// has the option of ignoring them.
for _, err := range errs {
if refErr, ok := err.(*resolver.ResolvingError); ok {
if refErr.CircularReference == nil {
return nil, errs
}
} else {
return nil, errs
}
}
highDoc := v3high.NewDocument(lowDoc)
return &DocumentModel[v3high.Document]{
Model: *highDoc,
}, nil
}, errs
}
// CompareDocuments will accept a left and right Document implementing struct, build a model for the correct