wip

Signed-off-by: Pierre Fenoll <[email protected]>

Author: fenollp

openapi3/callback.go

@@ -2,6 +2,7 @@ package openapi3
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 
 	"github.com/go-openapi/jsonpointer"
@@ -12,6 +13,16 @@ type Callbacks struct {
 	om *orderedmap.OrderedMap[string, *CallbackRef]
 }
 
+// MarshalJSON returns the JSON encoding of Callbacks.
+func (c *Callbacks) MarshalJSON() ([]byte, error) {
+	return c.om.MarshalJSON()
+}
+
+// UnmarshalJSON sets Callbacks to a copy of data.
+func (c *Callbacks) UnmarshalJSON(data []byte) error {
+	return json.Unmarshal(data, &c.om)
+}
+
 func (c *Callbacks) Value(key string) *CallbackRef {
 	// if c == nil || c.om == nil {
 	// 	return nil
@@ -42,7 +53,8 @@ func (c *Callbacks) Iter() *callbacksKV {
 type callbacksKV orderedmap.Pair[string, *CallbackRef] //FIXME: pub?
 
 func (pair *callbacksKV) Next() *callbacksKV {
-	return pair.Next()
+	ompair := (*orderedmap.Pair[string, *CallbackRef])(pair)
+	return (*callbacksKV)(ompair.Next())
 }
 
 var _ jsonpointer.JSONPointable = (*Callbacks)(nil)
@@ -63,14 +75,58 @@ func (c *Callbacks) JSONLookup(token string) (interface{}, error) {
 // Callback is specified by OpenAPI/Swagger standard version 3.
 // See https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#callbackObject
 type Callback struct {
-	orderedmap.OrderedMap[string, *PathItem]
+	om *orderedmap.OrderedMap[string, *PathItem]
+}
+
+// MarshalJSON returns the JSON encoding of Callback.
+func (callback *Callback) MarshalJSON() ([]byte, error) {
+	return callback.om.MarshalJSON()
+}
+
+// UnmarshalJSON sets Callback to a copy of data.
+func (callback *Callback) UnmarshalJSON(data []byte) error {
+	return json.Unmarshal(data, &callback.om)
+}
+
+func (callback *Callback) Value(key string) *PathItem {
+	// if callback == nil || callback.om == nil {
+	// 	return nil
+	// }
+	return callback.om.Value(key)
+}
+
+func (callback *Callback) Set(key string, value *PathItem) {
+	// if callback != nil || callback.om != nil {
+	_, _ = callback.om.Set(key, value)
+	// }
+}
+
+func (callback *Callback) Len() int {
+	if callback == nil || callback.om == nil {
+		return 0
+	}
+	return callback.om.Len()
+}
+
+func (callback *Callback) Iter() *callbackKV {
+	if callback == nil || callback.om == nil {
+		return nil
+	}
+	return (*callbackKV)(callback.om.Oldest())
+}
+
+type callbackKV orderedmap.Pair[string, *PathItem] //FIXME: pub?
+
+func (pair *callbackKV) Next() *callbackKV {
+	ompair := (*orderedmap.Pair[string, *PathItem])(pair)
+	return (*callbackKV)(ompair.Next())
 }
 
 // Validate returns an error if Callback does not comply with the OpenAPI spec.
 func (callback *Callback) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 
-	for pair := callback.Oldest(); pair != nil; pair = pair.Next() {
+	for pair := callback.Iter(); pair != nil; pair = pair.Next() {
 		if err := pair.Value.Validate(ctx); err != nil {
 			return err
 		}

openapi3/internalize_refs.go

@@ -307,7 +307,7 @@ func (doc *T) derefPaths(paths *orderedmap.OrderedMap[string, *PathItem], refNam
 				cb := pair.Value
 				isExternal := doc.addCallbackToSpec(cb, refNameResolver, parentIsExternal)
 				if cb.Value != nil {
-					cbValue := any(cb.Value).(*orderedmap.OrderedMap[string, *PathItem])
+					cbValue := (*orderedmap.OrderedMap[string, *PathItem])(cb.Value.om)
 					doc.derefPaths(cbValue, refNameResolver, parentIsExternal || isExternal)
 				}
 			}
@@ -379,7 +379,7 @@ func (doc *T) InternalizeRefs(ctx context.Context, refNameResolver func(ref stri
 		isExternal := doc.addCallbackToSpec(cb, refNameResolver, false)
 		if cb != nil && cb.Value != nil {
 			cb.Ref = "" // always dereference the top level
-			cbValue := any(cb.Value).(*orderedmap.OrderedMap[string, *PathItem])
+			cbValue := (*orderedmap.OrderedMap[string, *PathItem])(cb.Value.om)
 			doc.derefPaths(cbValue, refNameResolver, isExternal)
 		}
 	}

openapi3/loader.go

@@ -934,7 +934,7 @@ func (loader *Loader) resolveCallbackRef(doc *T, component *CallbackRef, documen
 		return nil
 	}
 
-	for pair := value.Oldest(); pair != nil; pair = pair.Next() {
+	for pair := value.Iter(); pair != nil; pair = pair.Next() {
 		entrypoint, pathItem := pair.Key, pair.Value
 		err = func() (err error) {
 			key := "-"
@@ -977,7 +977,7 @@ func (loader *Loader) resolveCallbackRef(doc *T, component *CallbackRef, documen
 						return failedToResolveRefFragmentPart(ref, id)
 					}
 
-					for pair := resolved.Value.Oldest(); pair != nil; pair = pair.Next() {
+					for pair := resolved.Value.Iter(); pair != nil; pair = pair.Next() {
 						*pathItem = *pair.Value
 						break
 					}

openapi3/paths.go

@@ -60,7 +60,7 @@ type pathsKV orderedmap.Pair[string, *PathItem] //FIXME: pub?
 
 func (pair *pathsKV) Next() *pathsKV {
 	ompair := (*orderedmap.Pair[string, *PathItem])(pair)
-	return (*pathsKV)((ompair).Next())
+	return (*pathsKV)(ompair.Next())
 }
 
 // NewPathsWithCapacity builds a paths object of the given capacity.