Skip to content

Commit

Permalink
Merge pull request #748 from hazendaz/thorough-cleanup
Browse files Browse the repository at this point in the history
[cleanup] For allNodes, change def to List<Node>
  • Loading branch information
hazendaz authored Dec 31, 2023
2 parents 3804fa1 + 833a170 commit 606b5f2
Show file tree
Hide file tree
Showing 47 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion src/it/basic-1/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/change-xml-filename/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ println '*********************************'

GPathResult path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/check-bug-file-multi-list/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ println '**********************************'

GPathResult path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/check-bug-file-multi/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ println '*********************************'

GPathResult path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/check-bug-file/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ println '*********************************'

GPathResult path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/check-jvmargs/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ println '*********************************'

GPathResult path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/check-multi/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ println '*********************************'
println 'Checking Spotbugs Native XML file'
println '*********************************'

def allNodes = path.depthFirst().collect { it }
List<Node> allNodes = path.depthFirst().collect { it }
int spotbugsErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/check-pluginList-repo/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ println '*********************************'

GPathResult path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
4 changes: 2 additions & 2 deletions src/it/check/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand All @@ -41,7 +41,7 @@ println '******************'

GPathResult path = new XmlSlurper().parse(spotbugXdoc)

def xNodes = path.depthFirst().collect{ it }
List<Node> xNodes = path.depthFirst().collect{ it }
int xdocErrors = xNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${xdocErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/effort-default/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/effort-max/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/effort-min/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/encoding-utf8/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/exclude-modules/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ println 'Checking Spotbugs Native XML file'
println '*********************************'


def allNodes = path.depthFirst().collect { it }
List<Node> allNodes = path.depthFirst().collect { it }
int spotbugsErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/exclude-multi-list/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/exclude-multi/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/exclude/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/excludeBugsFile/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ println '******************'

GPathResult path = new XmlSlurper().parse(spotbugXdoc)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int xdocErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${xdocErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/experimental/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/include-multi-list/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/include-multi/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/include/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/maxRank/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ println '******************'

GPathResult path = new XmlSlurper().parse(spotbugXdoc)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int xdocErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${xdocErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/multi-build/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ println '******************'

path = new XmlSlurper().parse(spotbugXdoc)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int xdocErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${xdocErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/multi/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ println '******************'

path = new XmlSlurper().parse(new File(basedir, "modules/${module}/target/spotbugs.xml"))

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int xdocErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${xdocErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/nested/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/no-testsrc/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/omitVisitors/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/onlyAnalyze/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/onlyAnalyzeFileSource/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/pluginList-repo/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/pluginList/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/relaxed/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/site-brazil/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/site-default/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/site-french/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/site-spanish/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/skipEmpty/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ println '*********************************'

GPathResult path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/threaded/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/threshold-experimental/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/threshold-high/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/threshold-low/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
2 changes: 1 addition & 1 deletion src/it/trace/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ println '*********************************'

path = new XmlSlurper().parse(spotbugXml)

def allNodes = path.depthFirst().collect{ it }
List<Node> allNodes = path.depthFirst().collect{ it }
int spotbugsXmlErrors = allNodes.findAll {it.name() == 'BugInstance'}.size()
println "BugInstance size is ${spotbugsXmlErrors}"

Expand Down
Loading

0 comments on commit 606b5f2

Please sign in to comment.