Skip to content

Commit

Permalink
chore: remove unused param from extractRequiredReferenceProperties
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickajacks1 @daveshanley
nickajacks1 authored and daveshanley committed Oct 12, 2024
1 parent 4b93cff commit eff4ce8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions index/utility_methods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func extractDefinitionRequiredRefProperties(schemaNode *yaml.Node, reqRefProps m
_, ofNode := utils.FindKeyNodeTop(key, param.Content)
if ofNode != nil {
for _, ofNodeItem := range ofNode.Content {
reqRefProps = extractRequiredReferenceProperties(fulldef, idx, ofNodeItem, name, reqRefProps)
reqRefProps = extractRequiredReferenceProperties(fulldef, ofNodeItem, name, reqRefProps)
}
}
}
Expand All @@ -97,14 +97,14 @@ func extractDefinitionRequiredRefProperties(schemaNode *yaml.Node, reqRefProps m
continue
}

reqRefProps = extractRequiredReferenceProperties(fulldef, idx, requiredPropDefNode, requiredPropertyNode.Value, reqRefProps)
reqRefProps = extractRequiredReferenceProperties(fulldef, requiredPropDefNode, requiredPropertyNode.Value, reqRefProps)
}

return reqRefProps
}

// extractRequiredReferenceProperties returns a map of definition names to the property or properties which reference it within a node
func extractRequiredReferenceProperties(fulldef string, idx *SpecIndex, requiredPropDefNode *yaml.Node, propName string, reqRefProps map[string][]string) map[string][]string {
func extractRequiredReferenceProperties(fulldef string, requiredPropDefNode *yaml.Node, propName string, reqRefProps map[string][]string) map[string][]string {
isRef, _, refName := utils.IsNodeRefValue(requiredPropDefNode)
if !isRef {
_, defItems := utils.FindKeyNodeTop("items", requiredPropDefNode.Content)
Expand Down Expand Up @@ -156,7 +156,7 @@ func extractRequiredReferenceProperties(fulldef string, idx *SpecIndex, required
abs, _ = filepath.Abs(utils.CheckPathOverlap(filepath.Dir(exp[0]), r[0],
string(os.PathSeparator)))

//abs, _ = filepath.Abs(filepath.Join(filepath.Dir(exp[0]), r[0],
// abs, _ = filepath.Abs(filepath.Join(filepath.Dir(exp[0]), r[0],
// string('J')))
}

Expand Down
28 changes: 14 additions & 14 deletions index/utility_methods_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func Test_extractRequiredReferenceProperties(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("the-big.yaml#/cheese/thing", nil,
data := extractRequiredReferenceProperties("the-big.yaml#/cheese/thing",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
assert.NotNil(t, data)
Expand All @@ -69,7 +69,7 @@ func Test_extractRequiredReferenceProperties_singleFile(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("dingo-bingo-bango.yaml", nil,
data := extractRequiredReferenceProperties("dingo-bingo-bango.yaml",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
assert.NotNil(t, data)
Expand All @@ -82,7 +82,7 @@ func Test_extractRequiredReferenceProperties_http(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("http://dingo-bingo-bango.yaml/camel.yaml", nil,
data := extractRequiredReferenceProperties("http://dingo-bingo-bango.yaml/camel.yaml",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
assert.NotNil(t, data)
Expand All @@ -95,7 +95,7 @@ func Test_extractRequiredReferenceProperties_abs(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("/camel.yaml", nil,
data := extractRequiredReferenceProperties("/camel.yaml",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
assert.NotNil(t, data)
Expand All @@ -108,7 +108,7 @@ func Test_extractRequiredReferenceProperties_abs3(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("/big/fat/camel.yaml#/milk", nil,
data := extractRequiredReferenceProperties("/big/fat/camel.yaml#/milk",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
if runtime.GOOS != "windows" {
Expand All @@ -124,7 +124,7 @@ func Test_extractRequiredReferenceProperties_rel_full(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("/chalky/milky/camel.yaml#/milk", nil,
data := extractRequiredReferenceProperties("/chalky/milky/camel.yaml#/milk",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
if runtime.GOOS != "windows" {
Expand All @@ -140,7 +140,7 @@ func Test_extractRequiredReferenceProperties_rel(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("/camel.yaml#/milk", nil,
data := extractRequiredReferenceProperties("/camel.yaml#/milk",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
if runtime.GOOS != "windows" {
Expand All @@ -156,7 +156,7 @@ func Test_extractRequiredReferenceProperties_abs2(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("../flannel.yaml#/milk", nil,
data := extractRequiredReferenceProperties("../flannel.yaml#/milk",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
if runtime.GOOS != "windows" {
Expand All @@ -172,7 +172,7 @@ func Test_extractRequiredReferenceProperties_http_rel(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("http://beer-world.com/lost/in/space.yaml#/vase", nil,
data := extractRequiredReferenceProperties("http://beer-world.com/lost/in/space.yaml#/vase",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
assert.Equal(t, "cakes", props["http://beer-world.com/lost/in/my/wet/camel.yaml#/rum/cake"][0])
Expand All @@ -186,7 +186,7 @@ func Test_extractRequiredReferenceProperties_http_rel_nocomponent(t *testing.T)
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("http://beer-world.com/lost/in/space.yaml#/vase", nil,
data := extractRequiredReferenceProperties("http://beer-world.com/lost/in/space.yaml#/vase",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
assert.Equal(t, "cakes", props["http://beer-world.com/lost/in/my/wet/camel.yaml"][0])
Expand All @@ -200,7 +200,7 @@ func Test_extractRequiredReferenceProperties_nocomponent(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("#/rotund/cakes", nil,
data := extractRequiredReferenceProperties("#/rotund/cakes",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
assert.Equal(t, "cakes", props["my/wet/camel.yaml"][0])
Expand All @@ -214,7 +214,7 @@ func Test_extractRequiredReferenceProperties_component_http(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("http://bunny-bun-bun.com/no.yaml", nil,
data := extractRequiredReferenceProperties("http://bunny-bun-bun.com/no.yaml",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
assert.Equal(t, "cakes", props["http://bunny-bun-bun.com/go-to-bed.com/no/more/cake.yaml#/lovely/jam"][0])
Expand All @@ -228,7 +228,7 @@ func Test_extractRequiredReferenceProperties_nocomponent_http(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("http://bunny-bun-bun.com/no.yaml", nil,
data := extractRequiredReferenceProperties("http://bunny-bun-bun.com/no.yaml",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
assert.Equal(t, "cakes", props["http://bunny-bun-bun.com/go-to-bed.com/no/more/cake.yaml"][0])
Expand All @@ -242,7 +242,7 @@ func Test_extractRequiredReferenceProperties_nocomponent_http2(t *testing.T) {
_ = yaml.Unmarshal([]byte(d), &rootNode)
props := make(map[string][]string)

data := extractRequiredReferenceProperties("/why.yaml", nil,
data := extractRequiredReferenceProperties("/why.yaml",
rootNode.Content[0], "cakes", props)
assert.Len(t, props, 1)
if runtime.GOOS != "windows" {
Expand Down

0 comments on commit eff4ce8

Please sign in to comment.