Java: Normalize parentheses.

Author: aschackmull

java/ql/src/Advisory/Documentation/JavadocCommon.qll

@@ -49,9 +49,9 @@ class DocuCallable extends Callable {
   predicate hasAcceptableDocText() { acceptableDocText(this.getDoc().getJavadoc()) }
 
   string toMethodOrConstructorString() {
-    (this instanceof Method and result = "method")
+    this instanceof Method and result = "method"
     or
-    (this instanceof Constructor and result = "constructor")
+    this instanceof Constructor and result = "constructor"
   }
 }
 

java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql

@@ -15,7 +15,7 @@ where
   callable.(Documentable).getJavadoc().getAChild() = paramTag and
   (if callable instanceof Constructor then what = "constructor" else what = "method") and
   if exists(paramTag.getParamName())
-  then (
+  then
     // The tag's value is neither matched by a callable parameter name ...
     not callable.getAParameter().getName() = paramTag.getParamName() and
     // ... nor by a type parameter name.
@@ -24,7 +24,7 @@ where
     ) and
     msg = "@param tag \"" + paramTag.getParamName() + "\" does not match any actual parameter of " +
         what + " \"" + callable.getName() + "()\"."
-  ) else
+  else
     // The tag has no value at all.
     msg = "This @param tag does not have a value."
 select paramTag, msg

java/ql/src/Compatibility/JDK9/JdkInternalAccess.ql

@@ -127,7 +127,7 @@ predicate jdkPackage(Package p) {
 from JdkInternalAccess ta, string repl, string msg
 where
   repl = ta.getReplacement() and
-  (if (repl = "unknown") then msg = "" else msg = " (" + repl + ")") and
+  (if repl = "unknown" then msg = "" else msg = " (" + repl + ")") and
   not jdkInternalApi(ta.getCompilationUnit().getPackage().getName()) and
   not jdkPackage(ta.getCompilationUnit().getPackage())
 select ta, "Access to unsupported JDK-internal API '" + ta.getAccessedApi() + "'." + msg

java/ql/src/Frameworks/Spring/Architecture/Refactoring Opportunities/UnusedBean.ql

@@ -39,13 +39,11 @@ class ImpureStmt extends Stmt {
   ImpureStmt() {
     exists(Expr e | e.getEnclosingStmt() = this |
       // Only permit calls to set of whitelisted targets.
-      (
-        e instanceof Call and
-        not e.(Call).getCallee().getDeclaringType().hasQualifiedName("java.util", "Collections")
-      )
+      e instanceof Call and
+      not e.(Call).getCallee().getDeclaringType().hasQualifiedName("java.util", "Collections")
       or
       // Writing to a field that is not an instance field is a no-no
-      (e instanceof FieldWrite and not e instanceof InstanceFieldWrite)
+      e instanceof FieldWrite and not e instanceof InstanceFieldWrite
     )
   }
 }
@@ -68,22 +66,20 @@ private Stmt getANestedStmt(Block block) {
  */
 class SpringPureClass extends Class {
   SpringPureClass() {
-    (
-      // The only permitted statement in static initializers is the initialization of a static
-      // final or effectively final logger fields, or effectively immutable types.
-      forall(Stmt s | s = getANestedStmt(getAMember().(StaticInitializer).getBody()) |
-        exists(Field f | f = s.(ExprStmt).getExpr().(AssignExpr).getDest().(FieldWrite).getField() |
-          (
-            // A logger field
-            f.getName().toLowerCase() = "logger" or
-            f.getName().toLowerCase() = "log" or
-            // An immutable type
-            f.getType() instanceof ImmutableType
-          ) and
-          f.isStatic() and
-          // Only written to in this statement e.g. final or effectively final
-          forall(FieldWrite fw | fw = f.getAnAccess() | fw.getEnclosingStmt() = s)
-        )
+    // The only permitted statement in static initializers is the initialization of a static
+    // final or effectively final logger fields, or effectively immutable types.
+    forall(Stmt s | s = getANestedStmt(getAMember().(StaticInitializer).getBody()) |
+      exists(Field f | f = s.(ExprStmt).getExpr().(AssignExpr).getDest().(FieldWrite).getField() |
+        (
+          // A logger field
+          f.getName().toLowerCase() = "logger" or
+          f.getName().toLowerCase() = "log" or
+          // An immutable type
+          f.getType() instanceof ImmutableType
+        ) and
+        f.isStatic() and
+        // Only written to in this statement e.g. final or effectively final
+        forall(FieldWrite fw | fw = f.getAnAccess() | fw.getEnclosingStmt() = s)
       )
     ) and
     // No constructor, instance initializer or Spring bean init or setter method that is impure.
@@ -145,12 +141,10 @@ class SpringBeanFactory extends ClassOrInterface {
 class LiveSpringBean extends SpringBean {
   LiveSpringBean() {
     // Must not be needed for side effects due to construction
-    (
-      // Only loaded by the container when required, so construction cannot have any useful side-effects
-      not isLazyInit() and
-      // or has no side-effects when constructed
-      not getClass() instanceof SpringPureClass
-    )
+    // Only loaded by the container when required, so construction cannot have any useful side-effects
+    not isLazyInit() and
+    // or has no side-effects when constructed
+    not getClass() instanceof SpringPureClass
     or
     (
       // If the class does not exist for this bean, or the class is not a source bean, then this is

java/ql/src/Language Abuse/EmptyStatement.ql

@@ -14,9 +14,6 @@ import java
 from EmptyStmt empty, string action
 where
   if exists(LoopStmt l | l.getBody() = empty)
-  then (
-    action = "turned into '{}'"
-  ) else (
-    action = "deleted"
-  )
+  then action = "turned into '{}'"
+  else action = "deleted"
 select empty, "This empty statement should be " + action + "."

java/ql/src/Language Abuse/TypeVariableHidesType.ql

@@ -27,7 +27,7 @@ RefType aTypeVisibleFrom(TypeVariable var) {
     result = i.getImportedType()
   )
   or
-  (var.getPackage() = result.getPackage() and result instanceof TopLevelType)
+  var.getPackage() = result.getPackage() and result instanceof TopLevelType
 }
 
 from RefType hidden, TypeVariable var

java/ql/src/Language Abuse/WrappedIterator.ql

@@ -21,10 +21,8 @@ predicate iteratorWrapper(Iterable it, Field f, boolean wrap) {
   (
     f.isFinal()
     or
-    (
-      strictcount(f.getAnAssignedValue()) = 1 and
-      f.getAnAssignedValue().getEnclosingCallable() instanceof InitializerMethod
-    )
+    strictcount(f.getAnAssignedValue()) = 1 and
+    f.getAnAssignedValue().getEnclosingCallable() instanceof InitializerMethod
   ) and
   // ... whose type is a sub-type of `java.util.Iterator` and ...
   f

java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.ql

@@ -12,7 +12,7 @@
 import java
 
 int integralTypeWidth(IntegralType t) {
-  if (t.hasName("long") or t.hasName("Long")) then result = 64 else result = 32
+  if t.hasName("long") or t.hasName("Long") then result = 64 else result = 32
 }
 
 int eval(Expr e) { result = e.(CompileTimeConstantExpr).getIntValue() }

java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql

@@ -71,26 +71,24 @@ class AssocNestedExpr extends BinaryExpr {
     exists(BinaryExpr parent, int idx | this.isNthChildOf(parent, idx) |
       // `+`, `*`, `&&`, `||` and the bitwise operations are associative.
       (
-        (
-          this instanceof AddExpr or
-          this instanceof MulExpr or
-          this instanceof BitwiseExpr or
-          this instanceof LogicalExpr
-        ) and
-        parent.getKind() = this.getKind()
-      )
+        this instanceof AddExpr or
+        this instanceof MulExpr or
+        this instanceof BitwiseExpr or
+        this instanceof LogicalExpr
+      ) and
+      parent.getKind() = this.getKind()
       or
       // Equality tests are associate over each other.
-      (this instanceof EqualityTest and parent instanceof EqualityTest)
+      this instanceof EqualityTest and parent instanceof EqualityTest
       or
       // (x*y)/z = x*(y/z)
-      (this instanceof MulExpr and parent instanceof DivExpr and idx = 0)
+      this instanceof MulExpr and parent instanceof DivExpr and idx = 0
       or
       // (x/y)%z = x/(y%z)
-      (this instanceof DivExpr and parent instanceof RemExpr and idx = 0)
+      this instanceof DivExpr and parent instanceof RemExpr and idx = 0
       or
       // (x+y)-z = x+(y-z)
-      (this instanceof AddExpr and parent instanceof SubExpr and idx = 0)
+      this instanceof AddExpr and parent instanceof SubExpr and idx = 0
     )
   }
 }
@@ -102,12 +100,10 @@ class AssocNestedExpr extends BinaryExpr {
 class HarmlessNestedExpr extends BinaryExpr {
   HarmlessNestedExpr() {
     exists(BinaryExpr parent | this = parent.getAChildExpr() |
-      (
-        parent instanceof RelationExpr and
-        (this instanceof ArithmeticExpr or this instanceof ShiftExpr)
-      )
+      parent instanceof RelationExpr and
+      (this instanceof ArithmeticExpr or this instanceof ShiftExpr)
       or
-      (parent instanceof LogicalExpr and this instanceof RelationExpr)
+      parent instanceof LogicalExpr and this instanceof RelationExpr
     )
   }
 }

java/ql/src/Likely Bugs/Collections/IteratorRemoveMayFail.ql

@@ -18,12 +18,10 @@ class SpecialCollectionCreation extends MethodAccess {
     exists(Method m, RefType rt |
       m = this.(MethodAccess).getCallee() and rt = m.getDeclaringType()
     |
-      (rt.hasQualifiedName("java.util", "Arrays") and m.hasName("asList"))
+      rt.hasQualifiedName("java.util", "Arrays") and m.hasName("asList")
       or
-      (
-        rt.hasQualifiedName("java.util", "Collections") and
-        m.getName().regexpMatch("singleton.*|unmodifiable.*")
-      )
+      rt.hasQualifiedName("java.util", "Collections") and
+      m.getName().regexpMatch("singleton.*|unmodifiable.*")
     )
   }
 }