update with different approach

reversearrow · reversearrow · commit 2db2b3929adb · 2024-09-30T08:13:10.000-04:00
diff --git a/openapi2/issues1010_test.go b/openapi2/issues1010_test.go
@@ -94,4 +94,5 @@ func TestIssue1010(t *testing.T) {
 	var doc2 T
 	err := json.Unmarshal(v2, &doc2)
 	require.NoError(t, err)
+	require.Equal(t, "petType", doc2.Definitions["Pet"].Value.Discriminator.PropertyName)
 }
diff --git a/openapi3/schema.go b/openapi3/schema.go
@@ -404,12 +404,42 @@ func (schema Schema) MarshalYAML() (any, error) {
 
 // UnmarshalJSON sets Schema to a copy of data.
 func (schema *Schema) UnmarshalJSON(data []byte) error {
-	type SchemaBis Schema
+	type Alias Schema
+	type SchemaBis struct {
+		Alias
+		Discriminator json.RawMessage `json:"discriminator,omitempty" yaml:"discriminator,omitempty"`
+	}
+
 	var x SchemaBis
 	if err := json.Unmarshal(data, &x); err != nil {
 		return unmarshalError(err)
 	}
-	_ = json.Unmarshal(data, &x.Extensions)
+
+	type DiscriminatorObject struct {
+		Discriminator *Discriminator `json:"discriminator,omitempty" yaml:"discriminator,omitempty"`
+	}
+
+	if len(x.Discriminator) > 0 {
+		var ds *string
+		if err := json.Unmarshal(x.Discriminator, &ds); err == nil {
+			// In OpenAPI 2, the Discriminator is a string field, while in OpenAPI 3,
+			// it corresponds to the Discriminator.PropertyName field.
+			// If the OpenAPI 2 Discriminator (ds) is not nil, we assign it to
+			// the OpenAPI 3 equivalent, which is Discriminator.PropertyName.
+			if ds != nil {
+				x.Alias.Discriminator = &Discriminator{
+					PropertyName: *ds,
+				}
+			}
+		} else {
+			var do DiscriminatorObject
+			if err := json.Unmarshal(x.Discriminator, &do.Discriminator); err == nil && do.Discriminator != nil {
+				x.Alias.Discriminator = do.Discriminator
+			}
+		}
+	}
+
+	_ = json.Unmarshal(data, &x.Alias.Extensions)
 
 	delete(x.Extensions, "oneOf")
 	delete(x.Extensions, "anyOf")
@@ -464,7 +494,7 @@ func (schema *Schema) UnmarshalJSON(data []byte) error {
 		x.Extensions = nil
 	}
 
-	*schema = Schema(x)
+	*schema = Schema(x.Alias)
 
 	if schema.Format == "date" {
 		// This is a fix for: https://github.com/getkin/kin-openapi/issues/697

Original file line number	Diff line number	Diff line change
`@@ -94,4 +94,5 @@ func TestIssue1010(t *testing.T) {`
`94`	`94`	`var doc2 T`
`95`	`95`	`err := json.Unmarshal(v2, &doc2)`
`96`	`96`	`require.NoError(t, err)`
	`97`	`+ require.Equal(t, "petType", doc2.Definitions["Pet"].Value.Discriminator.PropertyName)`
`97`	`98`	`}`