remove config from interfaceMap and stringMap

Reuven · Reuven · commit a9135b1418e7 · 2021-12-29T14:58:46.000+02:00
diff --git a/diff/discriminator_diff.go b/diff/discriminator_diff.go
@@ -66,7 +66,7 @@ func getDiscriminatorDiffInternal(config *Config, discriminator1, discriminator2
 
 	result.ExtensionsDiff = getExtensionsDiff(config, discriminator1.ExtensionProps, discriminator2.ExtensionProps)
 	result.PropertyNameDiff = getValueDiff(discriminator1.PropertyName, discriminator2.PropertyName)
-	result.MappingDiff = getStringMapDiff(config, discriminator1.Mapping, discriminator2.Mapping)
+	result.MappingDiff = getStringMapDiff(discriminator1.Mapping, discriminator2.Mapping)
 
 	return result
 }
diff --git a/diff/extensions_diff.go b/diff/extensions_diff.go
@@ -23,5 +23,5 @@ func getExtensionsDiff(config *Config, extensions1, extensions2 openapi3.Extensi
 }
 
 func getExtensionsDiffInternal(config *Config, extensions1, extensions2 openapi3.ExtensionProps) *InterfaceMapDiff {
-	return getInterfaceMapDiff(config, extensions1.Extensions, extensions2.Extensions, config.IncludeExtensions)
+	return getInterfaceMapDiff(extensions1.Extensions, extensions2.Extensions, config.IncludeExtensions)
 }
diff --git a/diff/interface_map_diff.go b/diff/interface_map_diff.go
@@ -32,8 +32,8 @@ func newInterfaceMapDiff() *InterfaceMapDiff {
 	}
 }
 
-func getInterfaceMapDiff(config *Config, map1, map2 InterfaceMap, filter StringSet) *InterfaceMapDiff {
-	diff := getInterfaceMapDiffInternal(config, map1, map2, filter)
+func getInterfaceMapDiff(map1, map2 InterfaceMap, filter StringSet) *InterfaceMapDiff {
+	diff := getInterfaceMapDiffInternal(map1, map2, filter)
 
 	if diff.Empty() {
 		return nil
@@ -42,7 +42,7 @@ func getInterfaceMapDiff(config *Config, map1, map2 InterfaceMap, filter StringS
 	return diff
 }
 
-func getInterfaceMapDiffInternal(config *Config, map1, map2 InterfaceMap, filter StringSet) *InterfaceMapDiff {
+func getInterfaceMapDiffInternal(map1, map2 InterfaceMap, filter StringSet) *InterfaceMapDiff {
 
 	result := newInterfaceMapDiff()
 
diff --git a/diff/link_diff.go b/diff/link_diff.go
@@ -52,7 +52,7 @@ func getLinkDiffInternal(config *Config, link1, link2 *openapi3.Link) (*LinkDiff
 	result.OperationIDDiff = getValueDiff(link1.OperationID, link2.OperationID)
 	result.OperationRefDiff = getValueDiff(link1.OperationRef, link2.OperationRef)
 	result.DescriptionDiff = getValueDiffConditional(config.ExcludeDescription, link1.Description, link2.Description)
-	result.ParametersDiff = getInterfaceMapDiff(config, link1.Parameters, link2.Parameters, StringSet{})
+	result.ParametersDiff = getInterfaceMapDiff(link1.Parameters, link2.Parameters, StringSet{})
 	result.ServerDiff = getServerDiff(config, link1.Server, link2.Server)
 	result.RequestBodyDiff = getValueDiff(link1.RequestBody, link2.RequestBody)
 
diff --git a/diff/oauth_flow.go b/diff/oauth_flow.go
@@ -63,7 +63,7 @@ func getOAuthFlowDiffInternal(config *Config, flow1, flow2 *openapi3.OAuthFlow)
 	result.AuthorizationURLDiff = getValueDiff(flow1.AuthorizationURL, flow2.AuthorizationURL)
 	result.TokenURLDiff = getValueDiff(flow1.TokenURL, flow2.TokenURL)
 	result.RefreshURLDiff = getValueDiff(flow1.RefreshURL, flow2.RefreshURL)
-	result.ScopesDiff = getStringMapDiff(config, flow1.Scopes, flow2.Scopes)
+	result.ScopesDiff = getStringMapDiff(flow1.Scopes, flow2.Scopes)
 
 	return &result
 }
diff --git a/diff/string_map_diff.go b/diff/string_map_diff.go
@@ -29,8 +29,8 @@ func (diff *StringMapDiff) Empty() bool {
 		len(diff.Modified) == 0
 }
 
-func getStringMapDiff(config *Config, strings1, strings2 StringMap) *StringMapDiff {
-	diff := getStringMapDiffInternal(config, strings1, strings2)
+func getStringMapDiff(strings1, strings2 StringMap) *StringMapDiff {
+	diff := getStringMapDiffInternal(strings1, strings2)
 
 	if diff.Empty() {
 		return nil
@@ -39,7 +39,7 @@ func getStringMapDiff(config *Config, strings1, strings2 StringMap) *StringMapDi
 	return diff
 }
 
-func getStringMapDiffInternal(config *Config, strings1, strings2 StringMap) *StringMapDiff {
+func getStringMapDiffInternal(strings1, strings2 StringMap) *StringMapDiff {
 	result := newStringMapDiffDiff()
 
 	for k1, v1 := range strings1 {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func getDiscriminatorDiffInternal(config *Config, discriminator1, discriminator2`
`66`	`66`
`67`	`67`	`result.ExtensionsDiff = getExtensionsDiff(config, discriminator1.ExtensionProps, discriminator2.ExtensionProps)`
`68`	`68`	`result.PropertyNameDiff = getValueDiff(discriminator1.PropertyName, discriminator2.PropertyName)`
`69`		`- result.MappingDiff = getStringMapDiff(config, discriminator1.Mapping, discriminator2.Mapping)`
	`69`	`+ result.MappingDiff = getStringMapDiff(discriminator1.Mapping, discriminator2.Mapping)`
`70`	`70`
`71`	`71`	`return result`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ func getExtensionsDiff(config *Config, extensions1, extensions2 openapi3.Extensi`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func getExtensionsDiffInternal(config Config, extensions1, extensions2 openapi3.ExtensionProps) InterfaceMapDiff {`
`26`		`- return getInterfaceMapDiff(config, extensions1.Extensions, extensions2.Extensions, config.IncludeExtensions)`
	`26`	`+ return getInterfaceMapDiff(extensions1.Extensions, extensions2.Extensions, config.IncludeExtensions)`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ func newInterfaceMapDiff() *InterfaceMapDiff {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`-func getInterfaceMapDiff(config Config, map1, map2 InterfaceMap, filter StringSet) InterfaceMapDiff {`
`36`		`- diff := getInterfaceMapDiffInternal(config, map1, map2, filter)`
	`35`	`+func getInterfaceMapDiff(map1, map2 InterfaceMap, filter StringSet) *InterfaceMapDiff {`
	`36`	`+ diff := getInterfaceMapDiffInternal(map1, map2, filter)`
`37`	`37`
`38`	`38`	`if diff.Empty() {`
`39`	`39`	`return nil`
`@@ -42,7 +42,7 @@ func getInterfaceMapDiff(config *Config, map1, map2 InterfaceMap, filter StringS`
`42`	`42`	`return diff`
`43`	`43`	`}`
`44`	`44`
`45`		`-func getInterfaceMapDiffInternal(config Config, map1, map2 InterfaceMap, filter StringSet) InterfaceMapDiff {`
	`45`	`+func getInterfaceMapDiffInternal(map1, map2 InterfaceMap, filter StringSet) *InterfaceMapDiff {`
`46`	`46`
`47`	`47`	`result := newInterfaceMapDiff()`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func getOAuthFlowDiffInternal(config Config, flow1, flow2 openapi3.OAuthFlow)`
`63`	`63`	`result.AuthorizationURLDiff = getValueDiff(flow1.AuthorizationURL, flow2.AuthorizationURL)`
`64`	`64`	`result.TokenURLDiff = getValueDiff(flow1.TokenURL, flow2.TokenURL)`
`65`	`65`	`result.RefreshURLDiff = getValueDiff(flow1.RefreshURL, flow2.RefreshURL)`
`66`		`- result.ScopesDiff = getStringMapDiff(config, flow1.Scopes, flow2.Scopes)`
	`66`	`+ result.ScopesDiff = getStringMapDiff(flow1.Scopes, flow2.Scopes)`
`67`	`67`
`68`	`68`	`return &result`
`69`	`69`	`}`