revert original approach

getkin · Sep 23, 2024 · 2e539ed · 2e539ed
1 parent 787fc8f
commit 2e539ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 42 deletions.
diff --git a/.github/docs/openapi3.txt b/.github/docs/openapi3.txt
@@ -1524,7 +1524,7 @@ type Schema struct {
 	MinProps             uint64               `json:"minProperties,omitempty" yaml:"minProperties,omitempty"`
 	MaxProps             *uint64              `json:"maxProperties,omitempty" yaml:"maxProperties,omitempty"`
 	AdditionalProperties AdditionalProperties `json:"additionalProperties,omitempty" yaml:"additionalProperties,omitempty"`
-	Discriminator        any                  `json:"discriminator,omitempty" yaml:"discriminator,omitempty"`
+	Discriminator        *Discriminator       `json:"discriminator,omitempty" yaml:"discriminator,omitempty"`
 }
     Schema is specified by OpenAPI/Swagger 3.0 standard. See
     https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#schema-object

diff --git a/openapi3/discriminator_test.go b/openapi3/discriminator_test.go
@@ -1,7 +1,6 @@
 package openapi3
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -53,15 +52,5 @@ func TestParsingDiscriminator(t *testing.T) {
 	err = doc.Validate(loader.Context)
 	require.NoError(t, err)
 
-	discriminatorMap, ok := doc.Components.Schemas["MyResponseType"].Value.Discriminator.(map[string]interface{})
-	require.True(t, ok)
-
-	marshaledDiscriminator, err := json.Marshal(discriminatorMap)
-	require.NoError(t, err)
-
-	var discriminator *Discriminator
-	err = json.Unmarshal(marshaledDiscriminator, &discriminator)
-	require.NoError(t, err)
-
-	require.Len(t, discriminator.Mapping, 2)
+	require.Len(t, doc.Components.Schemas["MyResponseType"].Value.Discriminator.Mapping, 2)
 }
diff --git a/openapi3/schema.go b/openapi3/schema.go
@@ -129,7 +129,7 @@ type Schema struct {
 	MinProps             uint64               `json:"minProperties,omitempty" yaml:"minProperties,omitempty"`
 	MaxProps             *uint64              `json:"maxProperties,omitempty" yaml:"maxProperties,omitempty"`
 	AdditionalProperties AdditionalProperties `json:"additionalProperties,omitempty" yaml:"additionalProperties,omitempty"`
-	Discriminator        any                  `json:"discriminator,omitempty" yaml:"discriminator,omitempty"`
+	Discriminator        *Discriminator       `json:"discriminator,omitempty" yaml:"discriminator,omitempty"`
 }
 
 type Types []string
@@ -1298,33 +1298,7 @@ func (schema *Schema) visitXOFOperations(settings *schemaValidationSettings, val
 	if v := schema.OneOf; len(v) > 0 {
 		var discriminatorRef string
 		if schema.Discriminator != nil {
-			var discriminator *Discriminator
-			if descriminatorValuemap, okcheck := schema.Discriminator.(map[string]any); okcheck {
-				marshaledDiscriminator, err := json.Marshal(descriminatorValuemap)
-				if err != nil {
-					return &SchemaError{
-						Schema:      schema,
-						SchemaField: "discriminator",
-						Reason:      fmt.Sprintf("unable to marshal the discriminator field in schema: %v", err),
-					}, false
-				}
-
-				if err := json.Unmarshal(marshaledDiscriminator, &discriminator); err != nil {
-					return &SchemaError{
-						Schema:      schema,
-						SchemaField: "discriminator",
-						Reason:      fmt.Sprintf("unable to unmarshall the discriminator field in schema: %v", err),
-					}, false
-				}
-			} else {
-				return &SchemaError{
-					Schema:      schema,
-					SchemaField: "discriminator",
-					Reason:      fmt.Sprintf("discriminator is expected to be an object, but received an unknown type"),
-				}, false
-			}
-
-			pn := discriminator.PropertyName
+			pn := schema.Discriminator.PropertyName
 			if valuemap, okcheck := value.(map[string]any); okcheck {
 				discriminatorVal, okcheck := valuemap[pn]
 				if !okcheck {
@@ -1345,7 +1319,7 @@ func (schema *Schema) visitXOFOperations(settings *schemaValidationSettings, val
 					}, false
 				}
 
-				if discriminatorRef, okcheck = discriminator.Mapping[discriminatorValString]; len(discriminator.Mapping) > 0 && !okcheck {
+				if discriminatorRef, okcheck = schema.Discriminator.Mapping[discriminatorValString]; len(schema.Discriminator.Mapping) > 0 && !okcheck {
 					return &SchemaError{
 						Value:       discriminatorVal,
 						Schema:      schema,