Java: Autoformat qls.

aschackmull · aschackmull · commit 25469637db5d · 2019-02-12T14:38:08.000+01:00
diff --git a/java/ql/src/Likely Bugs/Arithmetic/CondExprTypes.ql b/java/ql/src/Likely Bugs/Arithmetic/CondExprTypes.ql
@@ -12,7 +12,9 @@
 
 import java
 
-class CharType extends PrimitiveType { CharType() { this.hasName("char") } }
+class CharType extends PrimitiveType {
+  CharType() { this.hasName("char") }
+}
 
 private Type getABranchType(ConditionalExpr ce) {
   result = ce.getTrueExpr().getType() or
diff --git a/java/ql/src/Likely Bugs/Concurrency/LazyInitStaticField.ql b/java/ql/src/Likely Bugs/Concurrency/LazyInitStaticField.ql
@@ -16,7 +16,9 @@
 import java
 
 /** A comparison (using `==`) with `null`. */
-class NullEQExpr extends EQExpr { NullEQExpr() { exists(NullLiteral l | l.getParent() = this) } }
+class NullEQExpr extends EQExpr {
+  NullEQExpr() { exists(NullLiteral l | l.getParent() = this) }
+}
 
 /** An assignment to a static field. */
 class StaticFieldInit extends AssignExpr {
diff --git a/java/ql/src/Likely Bugs/Likely Typos/ContainerSizeCmpZero.ql b/java/ql/src/Likely Bugs/Likely Typos/ContainerSizeCmpZero.ql
@@ -15,7 +15,9 @@ import semmle.code.java.Collections
 import semmle.code.java.Maps
 
 /** A union of the possible kinds of container size calls. */
-abstract class SizeOfContainer extends Expr { abstract string getContainerKind(); }
+abstract class SizeOfContainer extends Expr {
+  abstract string getContainerKind();
+}
 
 /** A read access to the `length` field of an array. */
 class ArrayLengthRead extends FieldRead, SizeOfContainer {
diff --git a/java/ql/src/Performance/ConcatenationInLoops.ql b/java/ql/src/Performance/ConcatenationInLoops.ql
@@ -16,7 +16,9 @@ import semmle.code.java.Statement
 import semmle.code.java.JDK
 
 /** A use of `+` that has type `String`. */
-class StringCat extends AddExpr { StringCat() { this.getType() instanceof TypeString } }
+class StringCat extends AddExpr {
+  StringCat() { this.getType() instanceof TypeString }
+}
 
 /**
  * An assignment of the form
diff --git a/java/ql/src/Performance/InefficientToArray.ql b/java/ql/src/Performance/InefficientToArray.ql
@@ -39,7 +39,9 @@ predicate emptyArrayLiteral(Expr e) {
   )
 }
 
-class EmptyArrayLiteral extends Expr { EmptyArrayLiteral() { emptyArrayLiteral(this) } }
+class EmptyArrayLiteral extends Expr {
+  EmptyArrayLiteral() { emptyArrayLiteral(this) }
+}
 
 from EmptyArrayLiteral l, MethodAccess ma, Method m, GenericInterface coll
 where
diff --git a/java/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.ql b/java/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.ql
@@ -21,9 +21,13 @@ abstract class ExtremeValueField extends Field {
   ExtremeValueField() { getType() instanceof IntegralType }
 }
 
-class MinValueField extends ExtremeValueField { MinValueField() { this.getName() = "MIN_VALUE" } }
+class MinValueField extends ExtremeValueField {
+  MinValueField() { this.getName() = "MIN_VALUE" }
+}
 
-class MaxValueField extends ExtremeValueField { MaxValueField() { this.getName() = "MAX_VALUE" } }
+class MaxValueField extends ExtremeValueField {
+  MaxValueField() { this.getName() = "MAX_VALUE" }
+}
 
 class ExtremeSource extends VarAccess {
   ExtremeSource() { this.getVariable() instanceof ExtremeValueField }
diff --git a/java/ql/src/Security/CWE/CWE-798/HardcodedCredentialsComparison.ql b/java/ql/src/Security/CWE/CWE-798/HardcodedCredentialsComparison.ql
@@ -12,7 +12,9 @@
 import java
 import HardcodedCredentials
 
-class EqualsAccess extends MethodAccess { EqualsAccess() { getMethod() instanceof EqualsMethod } }
+class EqualsAccess extends MethodAccess {
+  EqualsAccess() { getMethod() instanceof EqualsMethod }
+}
 
 from EqualsAccess sink, HardcodedExpr source, PasswordVariable p
 where
diff --git a/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.ql b/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.ql
@@ -25,7 +25,9 @@ class TypeShiroWCPermission extends RefType {
   }
 }
 
-abstract class PermissionsConstruction extends Top { abstract Expr getInput(); }
+abstract class PermissionsConstruction extends Top {
+  abstract Expr getInput();
+}
 
 class PermissionsCheckMethodAccess extends MethodAccess, PermissionsConstruction {
   PermissionsCheckMethodAccess() {
diff --git a/java/ql/src/Violations of Best Practice/Declarations/NoConstantsOnly.ql b/java/ql/src/Violations of Best Practice/Declarations/NoConstantsOnly.ql
@@ -12,7 +12,9 @@
 
 import semmle.code.java.Member
 
-class ConstantField extends Field { ConstantField() { this.isStatic() and this.isFinal() } }
+class ConstantField extends Field {
+  ConstantField() { this.isStatic() and this.isFinal() }
+}
 
 pragma[noinline]
 predicate typeWithConstantField(RefType t) { exists(ConstantField f | f.getDeclaringType() = t) }
diff --git a/java/ql/src/Violations of Best Practice/legacy/AutoBoxing.ql b/java/ql/src/Violations of Best Practice/legacy/AutoBoxing.ql
@@ -12,10 +12,14 @@
 import java
 
 /** An expression of primitive type. */
-class PrimitiveExpr extends Expr { PrimitiveExpr() { this.getType() instanceof PrimitiveType } }
+class PrimitiveExpr extends Expr {
+  PrimitiveExpr() { this.getType() instanceof PrimitiveType }
+}
 
 /** An expression of boxed type. */
-class BoxedExpr extends Expr { BoxedExpr() { this.getType() instanceof BoxedType } }
+class BoxedExpr extends Expr {
+  BoxedExpr() { this.getType() instanceof BoxedType }
+}
 
 /**
  * Relate expressions and the variables they flow into in one step,

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,9 @@ predicate emptyArrayLiteral(Expr e) {`
`39`	`39`	`)`
`40`	`40`	`}`
`41`	`41`
`42`		`-class EmptyArrayLiteral extends Expr { EmptyArrayLiteral() { emptyArrayLiteral(this) } }`
	`42`	`+class EmptyArrayLiteral extends Expr {`
	`43`	`+ EmptyArrayLiteral() { emptyArrayLiteral(this) }`
	`44`	`+}`
`43`	`45`
`44`	`46`	`from EmptyArrayLiteral l, MethodAccess ma, Method m, GenericInterface coll`
`45`	`47`	`where`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,9 @@ class TypeShiroWCPermission extends RefType {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-abstract class PermissionsConstruction extends Top { abstract Expr getInput(); }`
	`28`	`+abstract class PermissionsConstruction extends Top {`
	`29`	`+ abstract Expr getInput();`
	`30`	`+}`
`29`	`31`
`30`	`32`	`class PermissionsCheckMethodAccess extends MethodAccess, PermissionsConstruction {`
`31`	`33`	`PermissionsCheckMethodAccess() {`