diff --git a/datamodel/high/2.0/definitions.go b/datamodel/high/v2/definitions.go similarity index 94% rename from datamodel/high/2.0/definitions.go rename to datamodel/high/v2/definitions.go index 3047dc9..80f616a 100644 --- a/datamodel/high/2.0/definitions.go +++ b/datamodel/high/v2/definitions.go @@ -6,8 +6,8 @@ package v2 import ( highbase "github.com/pb33f/libopenapi/datamodel/high/base" lowmodel "github.com/pb33f/libopenapi/datamodel/low" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type Definitions struct { diff --git a/datamodel/high/2.0/examples.go b/datamodel/high/v2/examples.go similarity index 89% rename from datamodel/high/2.0/examples.go rename to datamodel/high/v2/examples.go index f97f39f..0195a11 100644 --- a/datamodel/high/2.0/examples.go +++ b/datamodel/high/v2/examples.go @@ -3,7 +3,7 @@ package v2 -import low "github.com/pb33f/libopenapi/datamodel/low/2.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v2" type Examples struct { Values map[string]any diff --git a/datamodel/high/2.0/header.go b/datamodel/high/v2/header.go similarity index 97% rename from datamodel/high/2.0/header.go rename to datamodel/high/v2/header.go index 937beed..aba2658 100644 --- a/datamodel/high/2.0/header.go +++ b/datamodel/high/v2/header.go @@ -5,7 +5,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type Header struct { diff --git a/datamodel/high/2.0/items.go b/datamodel/high/v2/items.go similarity index 97% rename from datamodel/high/2.0/items.go rename to datamodel/high/v2/items.go index 3652bec..93d5bbe 100644 --- a/datamodel/high/2.0/items.go +++ b/datamodel/high/v2/items.go @@ -3,7 +3,7 @@ package v2 -import low "github.com/pb33f/libopenapi/datamodel/low/2.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v2" type Items struct { Type string diff --git a/datamodel/high/2.0/operation.go b/datamodel/high/v2/operation.go similarity index 97% rename from datamodel/high/2.0/operation.go rename to datamodel/high/v2/operation.go index f750019..a9961b9 100644 --- a/datamodel/high/2.0/operation.go +++ b/datamodel/high/v2/operation.go @@ -6,7 +6,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high/base" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type Operation struct { diff --git a/datamodel/high/2.0/parameter.go b/datamodel/high/v2/parameter.go similarity index 98% rename from datamodel/high/2.0/parameter.go rename to datamodel/high/v2/parameter.go index fc28c1e..de4bc5a 100644 --- a/datamodel/high/2.0/parameter.go +++ b/datamodel/high/v2/parameter.go @@ -6,7 +6,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high/base" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type Parameter struct { diff --git a/datamodel/high/2.0/parameter_definitions.go b/datamodel/high/v2/parameter_definitions.go similarity index 95% rename from datamodel/high/2.0/parameter_definitions.go rename to datamodel/high/v2/parameter_definitions.go index b40aa96..b35ad2e 100644 --- a/datamodel/high/2.0/parameter_definitions.go +++ b/datamodel/high/v2/parameter_definitions.go @@ -3,7 +3,7 @@ package v2 -import low "github.com/pb33f/libopenapi/datamodel/low/2.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v2" type ParameterDefinitions struct { Definitions map[string]*Parameter diff --git a/datamodel/high/2.0/path_item.go b/datamodel/high/v2/path_item.go similarity index 98% rename from datamodel/high/2.0/path_item.go rename to datamodel/high/v2/path_item.go index 4a4a6de..4ce4bef 100644 --- a/datamodel/high/2.0/path_item.go +++ b/datamodel/high/v2/path_item.go @@ -5,7 +5,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type PathItem struct { diff --git a/datamodel/high/2.0/paths.go b/datamodel/high/v2/paths.go similarity index 95% rename from datamodel/high/2.0/paths.go rename to datamodel/high/v2/paths.go index a878569..cac7bab 100644 --- a/datamodel/high/2.0/paths.go +++ b/datamodel/high/v2/paths.go @@ -5,7 +5,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type Paths struct { diff --git a/datamodel/high/2.0/response.go b/datamodel/high/v2/response.go similarity index 95% rename from datamodel/high/2.0/response.go rename to datamodel/high/v2/response.go index 42e22aa..bd13b44 100644 --- a/datamodel/high/2.0/response.go +++ b/datamodel/high/v2/response.go @@ -6,7 +6,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high/base" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type Response struct { diff --git a/datamodel/high/2.0/responses.go b/datamodel/high/v2/responses.go similarity index 95% rename from datamodel/high/2.0/responses.go rename to datamodel/high/v2/responses.go index 7528742..1e22e55 100644 --- a/datamodel/high/2.0/responses.go +++ b/datamodel/high/v2/responses.go @@ -5,7 +5,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type Responses struct { diff --git a/datamodel/high/2.0/responses_definitions.go b/datamodel/high/v2/responses_definitions.go similarity index 95% rename from datamodel/high/2.0/responses_definitions.go rename to datamodel/high/v2/responses_definitions.go index 04e0c85..b9cfa62 100644 --- a/datamodel/high/2.0/responses_definitions.go +++ b/datamodel/high/v2/responses_definitions.go @@ -3,7 +3,7 @@ package v2 -import low "github.com/pb33f/libopenapi/datamodel/low/2.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v2" type ResponsesDefinitions struct { Definitions map[string]*Response diff --git a/datamodel/high/2.0/scopes.go b/datamodel/high/v2/scopes.go similarity index 90% rename from datamodel/high/2.0/scopes.go rename to datamodel/high/v2/scopes.go index 8a847b0..a2f3110 100644 --- a/datamodel/high/2.0/scopes.go +++ b/datamodel/high/v2/scopes.go @@ -4,7 +4,7 @@ package v2 import ( - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type Scopes struct { diff --git a/datamodel/high/2.0/security_definitions.go b/datamodel/high/v2/security_definitions.go similarity index 91% rename from datamodel/high/2.0/security_definitions.go rename to datamodel/high/v2/security_definitions.go index d93b444..1ae3d75 100644 --- a/datamodel/high/2.0/security_definitions.go +++ b/datamodel/high/v2/security_definitions.go @@ -3,7 +3,7 @@ package v2 -import low "github.com/pb33f/libopenapi/datamodel/low/2.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v2" type SecurityDefinitions struct { Definitions map[string]*SecurityScheme diff --git a/datamodel/high/2.0/security_requirement.go b/datamodel/high/v2/security_requirement.go similarity index 93% rename from datamodel/high/2.0/security_requirement.go rename to datamodel/high/v2/security_requirement.go index ff4f369..51c0857 100644 --- a/datamodel/high/2.0/security_requirement.go +++ b/datamodel/high/v2/security_requirement.go @@ -3,7 +3,7 @@ package v2 -import low "github.com/pb33f/libopenapi/datamodel/low/2.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v2" type SecurityRequirement struct { Requirements map[string][]string diff --git a/datamodel/high/2.0/security_scheme.go b/datamodel/high/v2/security_scheme.go similarity index 96% rename from datamodel/high/2.0/security_scheme.go rename to datamodel/high/v2/security_scheme.go index 2bc8247..500f6dc 100644 --- a/datamodel/high/2.0/security_scheme.go +++ b/datamodel/high/v2/security_scheme.go @@ -5,7 +5,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type SecurityScheme struct { diff --git a/datamodel/high/2.0/swagger.go b/datamodel/high/v2/swagger.go similarity index 98% rename from datamodel/high/2.0/swagger.go rename to datamodel/high/v2/swagger.go index be51eef..5c4f8ff 100644 --- a/datamodel/high/2.0/swagger.go +++ b/datamodel/high/v2/swagger.go @@ -6,7 +6,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high/base" - low "github.com/pb33f/libopenapi/datamodel/low/2.0" + low "github.com/pb33f/libopenapi/datamodel/low/v2" ) type Swagger struct { diff --git a/datamodel/high/2.0/swagger_test.go b/datamodel/high/v2/swagger_test.go similarity index 99% rename from datamodel/high/2.0/swagger_test.go rename to datamodel/high/v2/swagger_test.go index e1d5eee..a96f726 100644 --- a/datamodel/high/2.0/swagger_test.go +++ b/datamodel/high/v2/swagger_test.go @@ -5,7 +5,7 @@ package v2 import ( "github.com/pb33f/libopenapi/datamodel" - v2 "github.com/pb33f/libopenapi/datamodel/low/2.0" + v2 "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/stretchr/testify/assert" "io/ioutil" diff --git a/datamodel/high/3.0/callback.go b/datamodel/high/v3/callback.go similarity index 92% rename from datamodel/high/3.0/callback.go rename to datamodel/high/v3/callback.go index d6026e5..dc9349d 100644 --- a/datamodel/high/3.0/callback.go +++ b/datamodel/high/v3/callback.go @@ -3,7 +3,7 @@ package v3 -import low "github.com/pb33f/libopenapi/datamodel/low/3.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v3" type Callback struct { Expression map[string]*PathItem diff --git a/datamodel/high/3.0/components.go b/datamodel/high/v3/components.go similarity index 99% rename from datamodel/high/3.0/components.go rename to datamodel/high/v3/components.go index 7d0620f..ddc069d 100644 --- a/datamodel/high/3.0/components.go +++ b/datamodel/high/v3/components.go @@ -7,8 +7,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/high" highbase "github.com/pb33f/libopenapi/datamodel/high/base" lowmodel "github.com/pb33f/libopenapi/datamodel/low" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" "github.com/pb33f/libopenapi/datamodel/low/base" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) const ( diff --git a/datamodel/high/3.0/document.go b/datamodel/high/v3/document.go similarity index 97% rename from datamodel/high/3.0/document.go rename to datamodel/high/v3/document.go index 9722895..d78d698 100644 --- a/datamodel/high/3.0/document.go +++ b/datamodel/high/v3/document.go @@ -6,7 +6,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high/base" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" ) diff --git a/datamodel/high/3.0/document_test.go b/datamodel/high/v3/document_test.go similarity index 99% rename from datamodel/high/3.0/document_test.go rename to datamodel/high/v3/document_test.go index 8bb3c7d..2627d3b 100644 --- a/datamodel/high/3.0/document_test.go +++ b/datamodel/high/v3/document_test.go @@ -6,7 +6,7 @@ package v3 import ( "fmt" "github.com/pb33f/libopenapi/datamodel" - lowv3 "github.com/pb33f/libopenapi/datamodel/low/3.0" + lowv3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/stretchr/testify/assert" "io/ioutil" "testing" diff --git a/datamodel/high/3.0/encoding.go b/datamodel/high/v3/encoding.go similarity index 94% rename from datamodel/high/3.0/encoding.go rename to datamodel/high/v3/encoding.go index a46e609..9af408d 100644 --- a/datamodel/high/3.0/encoding.go +++ b/datamodel/high/v3/encoding.go @@ -5,7 +5,7 @@ package v3 import ( lowmodel "github.com/pb33f/libopenapi/datamodel/low" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type Encoding struct { diff --git a/datamodel/high/3.0/header.go b/datamodel/high/v3/header.go similarity index 97% rename from datamodel/high/3.0/header.go rename to datamodel/high/v3/header.go index 3c1d080..dd37fe9 100644 --- a/datamodel/high/3.0/header.go +++ b/datamodel/high/v3/header.go @@ -6,8 +6,8 @@ package v3 import ( highbase "github.com/pb33f/libopenapi/datamodel/high/base" lowmodel "github.com/pb33f/libopenapi/datamodel/low" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" "github.com/pb33f/libopenapi/datamodel/low/base" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type Header struct { diff --git a/datamodel/high/3.0/label_constants.go b/datamodel/high/v3/label_constants.go similarity index 100% rename from datamodel/high/3.0/label_constants.go rename to datamodel/high/v3/label_constants.go diff --git a/datamodel/high/3.0/link.go b/datamodel/high/v3/link.go similarity index 94% rename from datamodel/high/3.0/link.go rename to datamodel/high/v3/link.go index 1f9375e..6132ecf 100644 --- a/datamodel/high/3.0/link.go +++ b/datamodel/high/v3/link.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type Link struct { diff --git a/datamodel/high/3.0/media_type.go b/datamodel/high/v3/media_type.go similarity index 96% rename from datamodel/high/3.0/media_type.go rename to datamodel/high/v3/media_type.go index 49c593b..794cb12 100644 --- a/datamodel/high/3.0/media_type.go +++ b/datamodel/high/v3/media_type.go @@ -7,7 +7,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high/base" lowmodel "github.com/pb33f/libopenapi/datamodel/low" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" "sync" ) diff --git a/datamodel/high/3.0/oauth_flow.go b/datamodel/high/v3/oauth_flow.go similarity index 94% rename from datamodel/high/3.0/oauth_flow.go rename to datamodel/high/v3/oauth_flow.go index f59046e..fa8896f 100644 --- a/datamodel/high/3.0/oauth_flow.go +++ b/datamodel/high/v3/oauth_flow.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type OAuthFlow struct { diff --git a/datamodel/high/3.0/oauth_flows.go b/datamodel/high/v3/oauth_flows.go similarity index 95% rename from datamodel/high/3.0/oauth_flows.go rename to datamodel/high/v3/oauth_flows.go index f5939ac..87db4a0 100644 --- a/datamodel/high/3.0/oauth_flows.go +++ b/datamodel/high/v3/oauth_flows.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type OAuthFlows struct { diff --git a/datamodel/high/3.0/oauth_flows_test.go b/datamodel/high/v3/oauth_flows_test.go similarity index 96% rename from datamodel/high/3.0/oauth_flows_test.go rename to datamodel/high/v3/oauth_flows_test.go index 189e800..074cb29 100644 --- a/datamodel/high/3.0/oauth_flows_test.go +++ b/datamodel/high/v3/oauth_flows_test.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/low" - v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" + v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/datamodel/high/3.0/operation.go b/datamodel/high/v3/operation.go similarity index 97% rename from datamodel/high/3.0/operation.go rename to datamodel/high/v3/operation.go index fb3cb11..0350405 100644 --- a/datamodel/high/3.0/operation.go +++ b/datamodel/high/v3/operation.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high/base" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type Operation struct { diff --git a/datamodel/high/3.0/operation_test.go b/datamodel/high/v3/operation_test.go similarity index 95% rename from datamodel/high/3.0/operation_test.go rename to datamodel/high/v3/operation_test.go index de1fd01..6089b39 100644 --- a/datamodel/high/3.0/operation_test.go +++ b/datamodel/high/v3/operation_test.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/low" - v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" + v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/datamodel/high/3.0/parameter.go b/datamodel/high/v3/parameter.go similarity index 96% rename from datamodel/high/3.0/parameter.go rename to datamodel/high/v3/parameter.go index ff4e32a..f05e2ef 100644 --- a/datamodel/high/3.0/parameter.go +++ b/datamodel/high/v3/parameter.go @@ -6,7 +6,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" "github.com/pb33f/libopenapi/datamodel/high/base" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type Parameter struct { diff --git a/datamodel/high/3.0/path_item.go b/datamodel/high/v3/path_item.go similarity index 97% rename from datamodel/high/3.0/path_item.go rename to datamodel/high/v3/path_item.go index d3372d8..e6c74f2 100644 --- a/datamodel/high/3.0/path_item.go +++ b/datamodel/high/v3/path_item.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) const ( diff --git a/datamodel/high/3.0/path_item_test.go b/datamodel/high/v3/path_item_test.go similarity index 95% rename from datamodel/high/3.0/path_item_test.go rename to datamodel/high/v3/path_item_test.go index 617e7af..90d78b2 100644 --- a/datamodel/high/3.0/path_item_test.go +++ b/datamodel/high/v3/path_item_test.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/low" - v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" + v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/datamodel/high/3.0/paths.go b/datamodel/high/v3/paths.go similarity index 94% rename from datamodel/high/3.0/paths.go rename to datamodel/high/v3/paths.go index 4aab87d..9aa42b2 100644 --- a/datamodel/high/3.0/paths.go +++ b/datamodel/high/v3/paths.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type Paths struct { diff --git a/datamodel/high/3.0/request_body.go b/datamodel/high/v3/request_body.go similarity index 92% rename from datamodel/high/3.0/request_body.go rename to datamodel/high/v3/request_body.go index 48e396c..ac8d508 100644 --- a/datamodel/high/3.0/request_body.go +++ b/datamodel/high/v3/request_body.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type RequestBody struct { diff --git a/datamodel/high/3.0/response.go b/datamodel/high/v3/response.go similarity index 94% rename from datamodel/high/3.0/response.go rename to datamodel/high/v3/response.go index 1086ec7..73cad2f 100644 --- a/datamodel/high/3.0/response.go +++ b/datamodel/high/v3/response.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type Response struct { diff --git a/datamodel/high/3.0/response_test.go b/datamodel/high/v3/response_test.go similarity index 96% rename from datamodel/high/3.0/response_test.go rename to datamodel/high/v3/response_test.go index c0f00a6..fee72c4 100644 --- a/datamodel/high/3.0/response_test.go +++ b/datamodel/high/v3/response_test.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/low" - v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" + v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/datamodel/high/3.0/responses.go b/datamodel/high/v3/responses.go similarity index 95% rename from datamodel/high/3.0/responses.go rename to datamodel/high/v3/responses.go index cdb71c0..f4e1db5 100644 --- a/datamodel/high/3.0/responses.go +++ b/datamodel/high/v3/responses.go @@ -5,7 +5,7 @@ package v3 import ( "fmt" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type Responses struct { diff --git a/datamodel/high/3.0/responses_test.go b/datamodel/high/v3/responses_test.go similarity index 95% rename from datamodel/high/3.0/responses_test.go rename to datamodel/high/v3/responses_test.go index fae9d0c..f6dc4c0 100644 --- a/datamodel/high/3.0/responses_test.go +++ b/datamodel/high/v3/responses_test.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/low" - v3 "github.com/pb33f/libopenapi/datamodel/low/3.0" + v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" diff --git a/datamodel/high/3.0/security_requirement.go b/datamodel/high/v3/security_requirement.go similarity index 93% rename from datamodel/high/3.0/security_requirement.go rename to datamodel/high/v3/security_requirement.go index 31815fa..ac24235 100644 --- a/datamodel/high/3.0/security_requirement.go +++ b/datamodel/high/v3/security_requirement.go @@ -3,7 +3,7 @@ package v3 -import low "github.com/pb33f/libopenapi/datamodel/low/3.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v3" type SecurityRequirement struct { ValueRequirements []map[string][]string diff --git a/datamodel/high/3.0/security_scheme.go b/datamodel/high/v3/security_scheme.go similarity index 95% rename from datamodel/high/3.0/security_scheme.go rename to datamodel/high/v3/security_scheme.go index 360422f..3fa0594 100644 --- a/datamodel/high/3.0/security_scheme.go +++ b/datamodel/high/v3/security_scheme.go @@ -5,7 +5,7 @@ package v3 import ( "github.com/pb33f/libopenapi/datamodel/high" - low "github.com/pb33f/libopenapi/datamodel/low/3.0" + low "github.com/pb33f/libopenapi/datamodel/low/v3" ) type SecurityScheme struct { diff --git a/datamodel/high/3.0/server.go b/datamodel/high/v3/server.go similarity index 91% rename from datamodel/high/3.0/server.go rename to datamodel/high/v3/server.go index b5130e2..c0e2627 100644 --- a/datamodel/high/3.0/server.go +++ b/datamodel/high/v3/server.go @@ -3,7 +3,7 @@ package v3 -import low "github.com/pb33f/libopenapi/datamodel/low/3.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v3" type Server struct { URL string diff --git a/datamodel/high/3.0/server_variable.go b/datamodel/high/v3/server_variable.go similarity index 91% rename from datamodel/high/3.0/server_variable.go rename to datamodel/high/v3/server_variable.go index 2cb45f1..484243e 100644 --- a/datamodel/high/3.0/server_variable.go +++ b/datamodel/high/v3/server_variable.go @@ -3,7 +3,7 @@ package v3 -import low "github.com/pb33f/libopenapi/datamodel/low/3.0" +import low "github.com/pb33f/libopenapi/datamodel/low/v3" type ServerVariable struct { Enum []string diff --git a/datamodel/low/2.0/definitions.go b/datamodel/low/v2/definitions.go similarity index 100% rename from datamodel/low/2.0/definitions.go rename to datamodel/low/v2/definitions.go diff --git a/datamodel/low/2.0/definitions_test.go b/datamodel/low/v2/definitions_test.go similarity index 100% rename from datamodel/low/2.0/definitions_test.go rename to datamodel/low/v2/definitions_test.go diff --git a/datamodel/low/2.0/examples.go b/datamodel/low/v2/examples.go similarity index 100% rename from datamodel/low/2.0/examples.go rename to datamodel/low/v2/examples.go diff --git a/datamodel/low/2.0/header.go b/datamodel/low/v2/header.go similarity index 100% rename from datamodel/low/2.0/header.go rename to datamodel/low/v2/header.go diff --git a/datamodel/low/2.0/header_test.go b/datamodel/low/v2/header_test.go similarity index 100% rename from datamodel/low/2.0/header_test.go rename to datamodel/low/v2/header_test.go diff --git a/datamodel/low/2.0/items.go b/datamodel/low/v2/items.go similarity index 100% rename from datamodel/low/2.0/items.go rename to datamodel/low/v2/items.go diff --git a/datamodel/low/2.0/items_test.go b/datamodel/low/v2/items_test.go similarity index 100% rename from datamodel/low/2.0/items_test.go rename to datamodel/low/v2/items_test.go diff --git a/datamodel/low/2.0/operation.go b/datamodel/low/v2/operation.go similarity index 100% rename from datamodel/low/2.0/operation.go rename to datamodel/low/v2/operation.go diff --git a/datamodel/low/2.0/operation_test.go b/datamodel/low/v2/operation_test.go similarity index 100% rename from datamodel/low/2.0/operation_test.go rename to datamodel/low/v2/operation_test.go diff --git a/datamodel/low/2.0/parameter.go b/datamodel/low/v2/parameter.go similarity index 100% rename from datamodel/low/2.0/parameter.go rename to datamodel/low/v2/parameter.go diff --git a/datamodel/low/2.0/parameter_test.go b/datamodel/low/v2/parameter_test.go similarity index 100% rename from datamodel/low/2.0/parameter_test.go rename to datamodel/low/v2/parameter_test.go diff --git a/datamodel/low/2.0/path_item.go b/datamodel/low/v2/path_item.go similarity index 100% rename from datamodel/low/2.0/path_item.go rename to datamodel/low/v2/path_item.go diff --git a/datamodel/low/2.0/path_item_test.go b/datamodel/low/v2/path_item_test.go similarity index 100% rename from datamodel/low/2.0/path_item_test.go rename to datamodel/low/v2/path_item_test.go diff --git a/datamodel/low/2.0/paths.go b/datamodel/low/v2/paths.go similarity index 100% rename from datamodel/low/2.0/paths.go rename to datamodel/low/v2/paths.go diff --git a/datamodel/low/2.0/paths_test.go b/datamodel/low/v2/paths_test.go similarity index 100% rename from datamodel/low/2.0/paths_test.go rename to datamodel/low/v2/paths_test.go diff --git a/datamodel/low/2.0/response.go b/datamodel/low/v2/response.go similarity index 100% rename from datamodel/low/2.0/response.go rename to datamodel/low/v2/response.go diff --git a/datamodel/low/2.0/response_test.go b/datamodel/low/v2/response_test.go similarity index 100% rename from datamodel/low/2.0/response_test.go rename to datamodel/low/v2/response_test.go diff --git a/datamodel/low/2.0/responses.go b/datamodel/low/v2/responses.go similarity index 100% rename from datamodel/low/2.0/responses.go rename to datamodel/low/v2/responses.go diff --git a/datamodel/low/2.0/responses_test.go b/datamodel/low/v2/responses_test.go similarity index 100% rename from datamodel/low/2.0/responses_test.go rename to datamodel/low/v2/responses_test.go diff --git a/datamodel/low/2.0/scopes.go b/datamodel/low/v2/scopes.go similarity index 100% rename from datamodel/low/2.0/scopes.go rename to datamodel/low/v2/scopes.go diff --git a/datamodel/low/2.0/security_requirement.go b/datamodel/low/v2/security_requirement.go similarity index 100% rename from datamodel/low/2.0/security_requirement.go rename to datamodel/low/v2/security_requirement.go diff --git a/datamodel/low/2.0/security_scheme.go b/datamodel/low/v2/security_scheme.go similarity index 100% rename from datamodel/low/2.0/security_scheme.go rename to datamodel/low/v2/security_scheme.go diff --git a/datamodel/low/2.0/security_scheme_test.go b/datamodel/low/v2/security_scheme_test.go similarity index 100% rename from datamodel/low/2.0/security_scheme_test.go rename to datamodel/low/v2/security_scheme_test.go diff --git a/datamodel/low/2.0/swagger.go b/datamodel/low/v2/swagger.go similarity index 100% rename from datamodel/low/2.0/swagger.go rename to datamodel/low/v2/swagger.go diff --git a/datamodel/low/2.0/swagger_test.go b/datamodel/low/v2/swagger_test.go similarity index 100% rename from datamodel/low/2.0/swagger_test.go rename to datamodel/low/v2/swagger_test.go diff --git a/datamodel/low/3.0/callback.go b/datamodel/low/v3/callback.go similarity index 100% rename from datamodel/low/3.0/callback.go rename to datamodel/low/v3/callback.go diff --git a/datamodel/low/3.0/callback_test.go b/datamodel/low/v3/callback_test.go similarity index 100% rename from datamodel/low/3.0/callback_test.go rename to datamodel/low/v3/callback_test.go diff --git a/datamodel/low/3.0/components.go b/datamodel/low/v3/components.go similarity index 100% rename from datamodel/low/3.0/components.go rename to datamodel/low/v3/components.go diff --git a/datamodel/low/3.0/components_test.go b/datamodel/low/v3/components_test.go similarity index 100% rename from datamodel/low/3.0/components_test.go rename to datamodel/low/v3/components_test.go diff --git a/datamodel/low/3.0/create_document.go b/datamodel/low/v3/create_document.go similarity index 100% rename from datamodel/low/3.0/create_document.go rename to datamodel/low/v3/create_document.go diff --git a/datamodel/low/3.0/create_document_test.go b/datamodel/low/v3/create_document_test.go similarity index 100% rename from datamodel/low/3.0/create_document_test.go rename to datamodel/low/v3/create_document_test.go diff --git a/datamodel/low/3.0/document.go b/datamodel/low/v3/document.go similarity index 100% rename from datamodel/low/3.0/document.go rename to datamodel/low/v3/document.go diff --git a/datamodel/low/3.0/encoding.go b/datamodel/low/v3/encoding.go similarity index 100% rename from datamodel/low/3.0/encoding.go rename to datamodel/low/v3/encoding.go diff --git a/datamodel/low/3.0/encoding_test.go b/datamodel/low/v3/encoding_test.go similarity index 100% rename from datamodel/low/3.0/encoding_test.go rename to datamodel/low/v3/encoding_test.go diff --git a/datamodel/low/3.0/header.go b/datamodel/low/v3/header.go similarity index 100% rename from datamodel/low/3.0/header.go rename to datamodel/low/v3/header.go diff --git a/datamodel/low/3.0/header_test.go b/datamodel/low/v3/header_test.go similarity index 100% rename from datamodel/low/3.0/header_test.go rename to datamodel/low/v3/header_test.go diff --git a/datamodel/low/3.0/link.go b/datamodel/low/v3/link.go similarity index 100% rename from datamodel/low/3.0/link.go rename to datamodel/low/v3/link.go diff --git a/datamodel/low/3.0/link_test.go b/datamodel/low/v3/link_test.go similarity index 100% rename from datamodel/low/3.0/link_test.go rename to datamodel/low/v3/link_test.go diff --git a/datamodel/low/3.0/media_type.go b/datamodel/low/v3/media_type.go similarity index 100% rename from datamodel/low/3.0/media_type.go rename to datamodel/low/v3/media_type.go diff --git a/datamodel/low/3.0/media_type_test.go b/datamodel/low/v3/media_type_test.go similarity index 100% rename from datamodel/low/3.0/media_type_test.go rename to datamodel/low/v3/media_type_test.go diff --git a/datamodel/low/3.0/oauth_flows.go b/datamodel/low/v3/oauth_flows.go similarity index 100% rename from datamodel/low/3.0/oauth_flows.go rename to datamodel/low/v3/oauth_flows.go diff --git a/datamodel/low/3.0/oauth_flows_test.go b/datamodel/low/v3/oauth_flows_test.go similarity index 100% rename from datamodel/low/3.0/oauth_flows_test.go rename to datamodel/low/v3/oauth_flows_test.go diff --git a/datamodel/low/3.0/operation.go b/datamodel/low/v3/operation.go similarity index 100% rename from datamodel/low/3.0/operation.go rename to datamodel/low/v3/operation.go diff --git a/datamodel/low/3.0/operation_test.go b/datamodel/low/v3/operation_test.go similarity index 100% rename from datamodel/low/3.0/operation_test.go rename to datamodel/low/v3/operation_test.go diff --git a/datamodel/low/3.0/parameter.go b/datamodel/low/v3/parameter.go similarity index 100% rename from datamodel/low/3.0/parameter.go rename to datamodel/low/v3/parameter.go diff --git a/datamodel/low/3.0/parameter_test.go b/datamodel/low/v3/parameter_test.go similarity index 100% rename from datamodel/low/3.0/parameter_test.go rename to datamodel/low/v3/parameter_test.go diff --git a/datamodel/low/3.0/path.go b/datamodel/low/v3/path.go similarity index 100% rename from datamodel/low/3.0/path.go rename to datamodel/low/v3/path.go diff --git a/datamodel/low/3.0/path_item.go b/datamodel/low/v3/path_item.go similarity index 100% rename from datamodel/low/3.0/path_item.go rename to datamodel/low/v3/path_item.go diff --git a/datamodel/low/3.0/path_test.go b/datamodel/low/v3/path_test.go similarity index 100% rename from datamodel/low/3.0/path_test.go rename to datamodel/low/v3/path_test.go diff --git a/datamodel/low/3.0/request_body.go b/datamodel/low/v3/request_body.go similarity index 100% rename from datamodel/low/3.0/request_body.go rename to datamodel/low/v3/request_body.go diff --git a/datamodel/low/3.0/request_body_test.go b/datamodel/low/v3/request_body_test.go similarity index 100% rename from datamodel/low/3.0/request_body_test.go rename to datamodel/low/v3/request_body_test.go diff --git a/datamodel/low/3.0/response.go b/datamodel/low/v3/response.go similarity index 100% rename from datamodel/low/3.0/response.go rename to datamodel/low/v3/response.go diff --git a/datamodel/low/3.0/response_test.go b/datamodel/low/v3/response_test.go similarity index 100% rename from datamodel/low/3.0/response_test.go rename to datamodel/low/v3/response_test.go diff --git a/datamodel/low/3.0/security_scheme.go b/datamodel/low/v3/security_scheme.go similarity index 100% rename from datamodel/low/3.0/security_scheme.go rename to datamodel/low/v3/security_scheme.go diff --git a/datamodel/low/3.0/security_scheme_test.go b/datamodel/low/v3/security_scheme_test.go similarity index 100% rename from datamodel/low/3.0/security_scheme_test.go rename to datamodel/low/v3/security_scheme_test.go diff --git a/datamodel/low/3.0/server.go b/datamodel/low/v3/server.go similarity index 100% rename from datamodel/low/3.0/server.go rename to datamodel/low/v3/server.go diff --git a/datamodel/low/3.0/server_test.go b/datamodel/low/v3/server_test.go similarity index 100% rename from datamodel/low/3.0/server_test.go rename to datamodel/low/v3/server_test.go diff --git a/datamodel/low/3.0/server_variable.go b/datamodel/low/v3/server_variable.go similarity index 100% rename from datamodel/low/3.0/server_variable.go rename to datamodel/low/v3/server_variable.go diff --git a/document.go b/document.go index edd380f..7ef6be8 100644 --- a/document.go +++ b/document.go @@ -16,10 +16,10 @@ package libopenapi import ( "fmt" "github.com/pb33f/libopenapi/datamodel" - v2high "github.com/pb33f/libopenapi/datamodel/high/2.0" - v3high "github.com/pb33f/libopenapi/datamodel/high/3.0" - v2low "github.com/pb33f/libopenapi/datamodel/low/2.0" - v3low "github.com/pb33f/libopenapi/datamodel/low/3.0" + 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/utils" "gopkg.in/yaml.v3" )