Merge pull request #747 from hazendaz/thorough-cleanup

More 'def' to proper naming
spotbugs · Dec 31, 2023 · 3804fa1 · 3804fa1
2 parents 180cea6 + 16a58ca
commit 3804fa1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/it/multi/verify.groovy b/src/it/multi/verify.groovy
@@ -46,7 +46,7 @@ xhtmlParser.setFeature("http://apache.org/xml/features/disallow-doctype-decl", f
 xhtmlParser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
 GPathResult path = xhtmlParser.parse(spotbugsHtml)
 
-def spotbugsErrors = path.body.'**'.find {main -> main.@id == 'bodyColumn'}.section[1].table.tr[1].td[1].toInteger()
+int spotbugsErrors = path.body.'**'.find {main -> main.@id == 'bodyColumn'}.section[1].table.tr[1].td[1].toInteger()
 println "Error Count is ${spotbugsErrors}"
 
 println '******************'

diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy
@@ -481,7 +481,7 @@ abstract class BaseViolationCheckMojo extends AbstractMojo {
             for (i in 0..bugCount-1) {
                 def bug = bugs[i]
                 int priorityNum = bug.'@priority' as Integer
-                def priorityName = SpotBugsInfo.spotbugsPriority[priorityNum]
+                String priorityName = SpotBugsInfo.spotbugsPriority[priorityNum]
                 String logMsg = priorityName + ': ' + bug.LongMessage.text() + SpotBugsInfo.BLANK + bug.SourceLine.'@classname' + SpotBugsInfo.BLANK +
                         bug.SourceLine.Message.text() + SpotBugsInfo.BLANK + bug.'@type'
 

diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
@@ -89,5 +89,5 @@ interface SpotBugsInfo {
 
     Map<String, String> spotbugsThresholds = [High: "high", Exp: "experimental", Low: "low", Medium: "medium", Default: "medium"]
 
-    def spotbugsPriority = ["unknown", "High", "Medium", "Low"]
+    List<String> spotbugsPriority = ["unknown", "High", "Medium", "Low"]
 }