fix after #870: make sure Bis does not surface up (#878)

fenollp · web-flow · commit f6d1b8c132b1 · 2023-11-28T11:51:16.000+01:00
diff --git a/openapi2/marsh.go b/openapi2/marsh.go
@@ -9,9 +9,9 @@ import (
 )
 
 func unmarshalError(jsonUnmarshalErr error) error {
-	if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis."); found && before != "" && after != "" {
+	if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis"); found && before != "" && after != "" {
 		before = strings.ReplaceAll(before, " Go struct ", " ")
-		return fmt.Errorf("%s.%s", before, after)
+		return fmt.Errorf("%s%s", before, strings.ReplaceAll(after, "Bis", ""))
 	}
 	return jsonUnmarshalErr
 }
diff --git a/openapi3/marsh.go b/openapi3/marsh.go
@@ -9,9 +9,9 @@ import (
 )
 
 func unmarshalError(jsonUnmarshalErr error) error {
-	if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis."); found && before != "" && after != "" {
+	if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis"); found && before != "" && after != "" {
 		before = strings.ReplaceAll(before, " Go struct ", " ")
-		return fmt.Errorf("%s.%s", before, after)
+		return fmt.Errorf("%s%s", before, strings.ReplaceAll(after, "Bis", ""))
 	}
 	return jsonUnmarshalErr
 }

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func unmarshalError(jsonUnmarshalErr error) error {`
`12`		`- if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis."); found && before != "" && after != "" {`
	`12`	`+ if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis"); found && before != "" && after != "" {`
`13`	`13`	`before = strings.ReplaceAll(before, " Go struct ", " ")`
`14`		`- return fmt.Errorf("%s.%s", before, after)`
	`14`	`+ return fmt.Errorf("%s%s", before, strings.ReplaceAll(after, "Bis", ""))`
`15`	`15`	`}`
`16`	`16`	`return jsonUnmarshalErr`
`17`	`17`	`}`