Java: Set literals.

Author: geoffw0

java/ql/lib/semmle/code/java/UnitTests.qll

@@ -38,11 +38,12 @@ class TearDownMethod extends Method {
 
 private class TestRelatedAnnotation extends Annotation {
   TestRelatedAnnotation() {
-    this.getType().getPackage().hasName("org.testng.annotations") or
-    this.getType().getPackage().hasName("org.junit") or
-    this.getType().getPackage().hasName("org.junit.runner") or
-    this.getType().getPackage().hasName("org.junit.jupiter.api") or
-    this.getType().getPackage().hasName("org.junit.jupiter.params")
+    this.getType()
+        .getPackage()
+        .hasName([
+            "org.testng.annotations", "org.junit", "org.junit.runner", "org.junit.jupiter.api",
+            "org.junit.jupiter.params"
+          ])
   }
 }
 

java/ql/lib/semmle/code/java/controlflow/unreachableblocks/ExcludeDebuggingProfilingLogging.qll

@@ -17,16 +17,11 @@ import semmle.code.java.controlflow.UnreachableBlocks
 class ExcludeDebuggingProfilingLogging extends ExcludedConstantField {
   ExcludeDebuggingProfilingLogging() {
     exists(string validFieldName |
-      validFieldName = "debug" or
-      validFieldName = "profiling" or
-      validFieldName = "profile" or
-      validFieldName = "time" or
-      validFieldName = "verbose" or
-      validFieldName = "report" or
-      validFieldName = "dbg" or
-      validFieldName = "timing" or
-      validFieldName = "assert" or
-      validFieldName = "log"
+      validFieldName =
+        [
+          "debug", "profiling", "profile", "time", "verbose", "report", "dbg", "timing", "assert",
+          "log"
+        ]
     |
       getName().regexpMatch(".*(?i)" + validFieldName + ".*")
     ) and

java/ql/lib/semmle/code/java/frameworks/JaxWS.qll

@@ -25,18 +25,15 @@ string getAJaxRsPackage(string subpackage) { result = getAJaxRsPackage() + "." +
 class JaxWsEndpoint extends Class {
   JaxWsEndpoint() {
     exists(AnnotationType a | a = this.getAnAnnotation().getType() |
-      a.hasName("WebService") or
-      a.hasName("WebServiceProvider") or
-      a.hasName("WebServiceClient")
+      a.hasName(["WebService", "WebServiceProvider", "WebServiceClient"])
     )
   }
 
   /** Gets a method annotated with `@WebMethod` or `@WebEndpoint`. */
   Callable getARemoteMethod() {
     result = this.getACallable() and
     exists(AnnotationType a | a = result.getAnAnnotation().getType() |
-      a.hasName("WebMethod") or
-      a.hasName("WebEndpoint")
+      a.hasName(["WebMethod", "WebEndpoint"])
     )
   }
 }
@@ -62,12 +59,7 @@ class JaxRsResourceMethod extends Method {
       a = this.getAnAnnotation().getType() and
       a.getPackage().getName() = getAJaxRsPackage()
     |
-      a.hasName("GET") or
-      a.hasName("POST") or
-      a.hasName("DELETE") or
-      a.hasName("PUT") or
-      a.hasName("OPTIONS") or
-      a.hasName("HEAD")
+      a.hasName(["GET", "POST", "DELETE", "PUT", "OPTIONS", "HEAD"])
     )
     or
     // A JaxRS resource method can also inherit these annotations from a supertype, but only if
@@ -201,13 +193,10 @@ class JaxRsInjectionAnnotation extends JaxRSAnnotation {
       a = this.getType() and
       a.getPackage().getName() = getAJaxRsPackage()
     |
-      a.hasName("BeanParam") or
-      a.hasName("CookieParam") or
-      a.hasName("FormParam") or
-      a.hasName("HeaderParam") or
-      a.hasName("MatrixParam") or
-      a.hasName("PathParam") or
-      a.hasName("QueryParam")
+      a.hasName([
+          "BeanParam", "CookieParam", "FormParam", "HeaderParam", "MatrixParam", "PathParam",
+          "QueryParam"
+        ])
     )
     or
     this.getType().hasQualifiedName(getAJaxRsPackage("core"), "Context")

java/ql/lib/semmle/code/java/frameworks/Protobuf.qll

@@ -40,13 +40,7 @@ class ProtobufMessageLite extends Interface {
    */
   Method getAGetterMethod() {
     exists(RefType decl | decl = result.getDeclaringType() and decl = this.getASubtype+() |
-      exists(string name, string suffix |
-        suffix = "" or
-        suffix = "list" or
-        suffix = "map" or
-        suffix = "ordefault" or
-        suffix = "orthrow"
-      |
+      exists(string name, string suffix | suffix = ["", "list", "map", "ordefault", "orthrow"] |
         exists(Field f | f.getDeclaringType() = decl |
           f.getName().toLowerCase().replaceAll("_", "") = name
         ) and

java/ql/lib/semmle/code/java/metrics/MetricRefType.qll

@@ -264,11 +264,7 @@ class MetricRefType extends RefType, MetricElement {
    * for use with the specialization index metric.
    */
   predicate ignoreOverride(Method c) {
-    c.hasStringSignature("equals(Object)") or
-    c.hasStringSignature("hashCode()") or
-    c.hasStringSignature("toString()") or
-    c.hasStringSignature("finalize()") or
-    c.hasStringSignature("clone()")
+    c.hasStringSignature(["equals(Object)", "hashCode()", "toString()", "finalize()", "clone()"])
   }
 
   /** Gets a method that overrides a non-abstract method in a super type. */

java/ql/lib/semmle/code/java/security/RelativePaths.qll

@@ -7,10 +7,7 @@ import java
 predicate relativePath(Element tree, string command) {
   exists(StringLiteral lit, string text | tree = lit and text = lit.getRepresentedString() |
     text != "" and
-    (
-      text.regexpMatch("[^/\\\\ \t]*") or
-      text.regexpMatch("[^/\\\\ \t]*[ \t].*")
-    ) and
+    text.regexpMatch(["[^/\\\\ \t]*", "[^/\\\\ \t]*[ \t].*"]) and
     command = text.replaceAll("\t", " ").splitAt(" ", 0).replaceAll("\"", "")
   )
   or
@@ -35,39 +32,11 @@ predicate arrayStartingWithRelative(Element tree, string command) {
  * because they do not correspond to files in the filesystem.
  */
 predicate shellBuiltin(string command) {
-  command = "." or
-  command = "[" or
-  command = "[[" or
-  command = "alias" or
-  command = "builtin" or
-  command = "case" or
-  command = "command" or
-  command = "compgen" or
-  command = "complete" or
-  command = "compopt" or
-  command = "echo" or
-  command = "eval" or
-  command = "exec" or
-  command = "false" or
-  command = "fc" or
-  command = "for" or
-  command = "getopts" or
-  command = "help" or
-  command = "history" or
-  command = "if" or
-  command = "kill" or
-  command = "printf" or
-  command = "pwd" or
-  command = "select" or
-  command = "source" or
-  command = "test" or
-  command = "time" or
-  command = "times" or
-  command = "trap" or
-  command = "true" or
-  command = "type" or
-  command = "typeset" or
-  command = "ulimit" or
-  command = "until" or
-  command = "while"
+  command =
+    [
+      ".", "[", "[[", "alias", "builtin", "case", "command", "compgen", "complete", "compopt",
+      "echo", "eval", "exec", "false", "fc", "for", "getopts", "help", "history", "if", "kill",
+      "printf", "pwd", "select", "source", "test", "time", "times", "trap", "true", "type",
+      "typeset", "ulimit", "until", "while"
+    ]
 }