Merge pull request #12 from oasdiff/cleanup/remove-dead-origin-code

cleanup: remove dead origin-stripping code now handled by extractOrigins

Author: reuvenharrison

openapi3/callback.go

@@ -56,6 +56,6 @@ func (callback *Callback) Validate(ctx context.Context, opts ...ValidationOption
 
 // UnmarshalJSON sets Callbacks to a copy of data.
 func (callbacks *Callbacks) UnmarshalJSON(data []byte) (err error) {
-	*callbacks, _, err = unmarshalStringMapP[CallbackRef](data)
+	*callbacks, err = unmarshalStringMapP[CallbackRef](data)
 	return
 }

openapi3/components.go

@@ -95,8 +95,6 @@ func (components *Components) UnmarshalJSON(data []byte) error {
 		return unmarshalError(err)
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "schemas")
 	delete(x.Extensions, "parameters")
 	delete(x.Extensions, "headers")

openapi3/contact.go

@@ -52,8 +52,6 @@ func (contact *Contact) UnmarshalJSON(data []byte) error {
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
 
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "name")
 	delete(x.Extensions, "url")
 	delete(x.Extensions, "email")

openapi3/content.go

@@ -125,6 +125,6 @@ func (content Content) Validate(ctx context.Context, opts ...ValidationOption) e
 
 // UnmarshalJSON sets Content to a copy of data.
 func (content *Content) UnmarshalJSON(data []byte) (err error) {
-	*content, _, err = unmarshalStringMapP[MediaType](data)
+	*content, err = unmarshalStringMapP[MediaType](data)
 	return
 }

openapi3/discriminator.go

@@ -60,8 +60,6 @@ func (discriminator *Discriminator) UnmarshalJSON(data []byte) error {
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
 
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "propertyName")
 	delete(x.Extensions, "mapping")
 	if len(x.Extensions) == 0 {

openapi3/encoding.go

@@ -29,7 +29,7 @@ type Encodings map[string]*Encoding
 
 // UnmarshalJSON sets Encodings to a copy of data, stripping __origin__ metadata.
 func (encodings *Encodings) UnmarshalJSON(data []byte) (err error) {
-	*encodings, _, err = unmarshalStringMapP[Encoding](data)
+	*encodings, err = unmarshalStringMapP[Encoding](data)
 	return
 }
 
@@ -91,8 +91,6 @@ func (encoding *Encoding) UnmarshalJSON(data []byte) error {
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
 
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "contentType")
 	delete(x.Extensions, "headers")
 	delete(x.Extensions, "style")

openapi3/example.go

@@ -60,8 +60,6 @@ func (example *Example) UnmarshalJSON(data []byte) error {
 		return unmarshalError(err)
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "summary")
 	delete(x.Extensions, "description")
 	delete(x.Extensions, "value")
@@ -70,7 +68,6 @@ func (example *Example) UnmarshalJSON(data []byte) error {
 		x.Extensions = nil
 	}
 	*example = Example(x)
-	example.Value = stripOriginFromAny(example.Value)
 	return nil
 }
 
@@ -90,6 +87,6 @@ func (example *Example) Validate(ctx context.Context, opts ...ValidationOption)
 
 // UnmarshalJSON sets Examples to a copy of data.
 func (examples *Examples) UnmarshalJSON(data []byte) (err error) {
-	*examples, _, err = unmarshalStringMapP[ExampleRef](data)
+	*examples, err = unmarshalStringMapP[ExampleRef](data)
 	return
 }

openapi3/external_docs.go

@@ -50,8 +50,6 @@ func (e *ExternalDocs) UnmarshalJSON(data []byte) error {
 		return unmarshalError(err)
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "description")
 	delete(x.Extensions, "url")
 	if len(x.Extensions) == 0 {

openapi3/header.go

@@ -97,6 +97,6 @@ func (header *Header) Validate(ctx context.Context, opts ...ValidationOption) er
 
 // UnmarshalJSON sets Headers to a copy of data.
 func (headers *Headers) UnmarshalJSON(data []byte) (err error) {
-	*headers, _, err = unmarshalStringMapP[HeaderRef](data)
+	*headers, err = unmarshalStringMapP[HeaderRef](data)
 	return
 }

openapi3/info.go

@@ -63,8 +63,6 @@ func (info *Info) UnmarshalJSON(data []byte) error {
 		return unmarshalError(err)
 	}
 	_ = json.Unmarshal(data, &x.Extensions)
-	delete(x.Extensions, originKey)
-	stripExtensionsOrigin(x.Extensions)
 	delete(x.Extensions, "title")
 	delete(x.Extensions, "description")
 	delete(x.Extensions, "termsOfService")