Use set literals #2

owen-mc · owen-mc · commit 992bd68d4b5c · 2025-11-28T03:48:50.000Z
diff --git a/java/ql/lib/semmle/code/java/NumberFormatException.qll b/java/ql/lib/semmle/code/java/NumberFormatException.qll
@@ -46,12 +46,7 @@ private class SpecialClassInstanceExpr extends ClassInstanceExpr {
   }
 
   predicate throwsNfe() {
-    this.isStringConstructor("Byte") or
-    this.isStringConstructor("Short") or
-    this.isStringConstructor("Integer") or
-    this.isStringConstructor("Long") or
-    this.isStringConstructor("Float") or
-    this.isStringConstructor("Double")
+    this.isStringConstructor(["Byte", "Short", "Integer", "Long", "Float", "Double"])
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/JAXB.qll b/java/ql/lib/semmle/code/java/frameworks/JAXB.qll
@@ -107,10 +107,7 @@ class XmlAccessType extends EnumConstant {
  */
 class JaxbMemberAnnotation extends JaxbAnnotationType {
   JaxbMemberAnnotation() {
-    this.hasName("XmlElement") or
-    this.hasName("XmlAttribute") or
-    this.hasName("XmlElementRefs") or
-    this.hasName("XmlElements")
+    this.hasName(["XmlElement", "XmlAttribute", "XmlElementRefs", "XmlElements"])
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/spring/SpringController.qll b/java/ql/lib/semmle/code/java/frameworks/spring/SpringController.qll
@@ -187,13 +187,10 @@ class SpringServletInputAnnotation extends Annotation {
       a = this.getType() and
       a.getPackage().getName() = "org.springframework.web.bind.annotation"
     |
-      a.hasName("MatrixVariable") or
-      a.hasName("RequestParam") or
-      a.hasName("RequestHeader") or
-      a.hasName("CookieValue") or
-      a.hasName("RequestPart") or
-      a.hasName("PathVariable") or
-      a.hasName("RequestBody")
+      a.hasName([
+          "MatrixVariable", "RequestParam", "RequestHeader", "CookieValue", "RequestPart",
+          "PathVariable", "RequestBody"
+        ])
     )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,7 @@ private class SpecialClassInstanceExpr extends ClassInstanceExpr {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`predicate throwsNfe() {`
`49`		`- this.isStringConstructor("Byte") or`
`50`		`- this.isStringConstructor("Short") or`
`51`		`- this.isStringConstructor("Integer") or`
`52`		`- this.isStringConstructor("Long") or`
`53`		`- this.isStringConstructor("Float") or`
`54`		`- this.isStringConstructor("Double")`
	`49`	`+ this.isStringConstructor(["Byte", "Short", "Integer", "Long", "Float", "Double"])`
`55`	`50`	`}`
`56`	`51`	`}`
`57`	`52`
Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,7 @@ class XmlAccessType extends EnumConstant {`
`107`	`107`	`*/`
`108`	`108`	`class JaxbMemberAnnotation extends JaxbAnnotationType {`
`109`	`109`	`JaxbMemberAnnotation() {`
`110`		`- this.hasName("XmlElement") or`
`111`		`- this.hasName("XmlAttribute") or`
`112`		`- this.hasName("XmlElementRefs") or`
`113`		`- this.hasName("XmlElements")`
	`110`	`+ this.hasName(["XmlElement", "XmlAttribute", "XmlElementRefs", "XmlElements"])`
`114`	`111`	`}`
`115`	`112`	`}`
`116`	`113`
Original file line number	Diff line number	Diff line change
`@@ -187,13 +187,10 @@ class SpringServletInputAnnotation extends Annotation {`
`187`	`187`	`a = this.getType() and`
`188`	`188`	`a.getPackage().getName() = "org.springframework.web.bind.annotation"`
`189`	`189`	`\|`
`190`		`- a.hasName("MatrixVariable") or`
`191`		`- a.hasName("RequestParam") or`
`192`		`- a.hasName("RequestHeader") or`
`193`		`- a.hasName("CookieValue") or`
`194`		`- a.hasName("RequestPart") or`
`195`		`- a.hasName("PathVariable") or`
`196`		`- a.hasName("RequestBody")`
	`190`	`+ a.hasName([`
	`191`	`+ "MatrixVariable", "RequestParam", "RequestHeader", "CookieValue", "RequestPart",`
	`192`	`+ "PathVariable", "RequestBody"`
	`193`	`+ ])`
`197`	`194`	`)`
`198`	`195`	`}`
`199`	`196`	`}`