From 629c19e7191be5aea9d2f490dabb92cf93877703 Mon Sep 17 00:00:00 2001 From: Anders Schack-Mulligen Date: Wed, 21 Aug 2019 14:38:17 +0200 Subject: [PATCH] Java: Autoformat. --- java/ql/src/Performance/ConcatenationInLoops.ql | 4 +++- java/ql/src/semmle/code/java/Expr.qll | 4 +--- java/ql/src/semmle/code/java/Member.qll | 4 +--- .../semmle/code/java/controlflow/internal/Preconditions.qll | 1 + java/ql/src/semmle/code/java/dataflow/TaintTracking.qll | 5 ++--- .../code/java/dataflow/internal/TaintTrackingUtil.qll | 6 ++---- .../dataflow/internal/tainttracking1/TaintTrackingImpl.qll | 1 - .../dataflow/internal/tainttracking2/TaintTrackingImpl.qll | 1 - java/ql/src/semmle/code/java/dispatch/ObjFlow.qll | 1 + .../library-tests/frameworks/android/manifest/manifest.ql | 3 ++- java/ql/test/library-tests/frameworks/guice/flow.ql | 4 +--- 11 files changed, 14 insertions(+), 20 deletions(-) diff --git a/java/ql/src/Performance/ConcatenationInLoops.ql b/java/ql/src/Performance/ConcatenationInLoops.ql index 7f1dd4ce1de..2f0d771026b 100644 --- a/java/ql/src/Performance/ConcatenationInLoops.ql +++ b/java/ql/src/Performance/ConcatenationInLoops.ql @@ -57,5 +57,7 @@ predicate declaredInLoop(LocalVariableDecl v, LoopStmt loop) { from Assignment a, Variable v where useAndDef(a, v) and - exists(LoopStmt loop | a.getEnclosingStmt().getEnclosingStmt*() = loop | not declaredInLoop(v, loop)) + exists(LoopStmt loop | a.getEnclosingStmt().getEnclosingStmt*() = loop | + not declaredInLoop(v, loop) + ) select a, "The string " + v.getName() + " is built-up in a loop: use string buffer." diff --git a/java/ql/src/semmle/code/java/Expr.qll b/java/ql/src/semmle/code/java/Expr.qll index baeefc94541..cffd536e77a 100755 --- a/java/ql/src/semmle/code/java/Expr.qll +++ b/java/ql/src/semmle/code/java/Expr.qll @@ -1117,9 +1117,7 @@ class SwitchExpr extends Expr, @switchexpr { Expr getAResult() { result = getACase().getRuleExpression() or - exists(BreakStmt break | - break.(JumpStmt).getTarget() = this and result = break.getValue() - ) + exists(BreakStmt break | break.(JumpStmt).getTarget() = this and result = break.getValue()) } /** Gets a printable representation of this expression. */ diff --git a/java/ql/src/semmle/code/java/Member.qll b/java/ql/src/semmle/code/java/Member.qll index 46aa8721ef4..6070cb420ca 100755 --- a/java/ql/src/semmle/code/java/Member.qll +++ b/java/ql/src/semmle/code/java/Member.qll @@ -120,9 +120,7 @@ class Callable extends StmtParent, Member, @callable { * * This includes both static call targets and dynamic dispatch targets. */ - predicate polyCalls(Callable m) { - this.calls(m) or this.callsImpl(m) - } + predicate polyCalls(Callable m) { this.calls(m) or this.callsImpl(m) } /** * Holds if `c` is a viable implementation of a callable called by this diff --git a/java/ql/src/semmle/code/java/controlflow/internal/Preconditions.qll b/java/ql/src/semmle/code/java/controlflow/internal/Preconditions.qll index 59828a1e11f..9f7fbc14aa4 100644 --- a/java/ql/src/semmle/code/java/controlflow/internal/Preconditions.qll +++ b/java/ql/src/semmle/code/java/controlflow/internal/Preconditions.qll @@ -3,6 +3,7 @@ * `com.google.common.base.Preconditions` and * `org.apache.commons.lang3.Validate`. */ + import java /** diff --git a/java/ql/src/semmle/code/java/dataflow/TaintTracking.qll b/java/ql/src/semmle/code/java/dataflow/TaintTracking.qll index fa8564f182f..62ed94fa49f 100644 --- a/java/ql/src/semmle/code/java/dataflow/TaintTracking.qll +++ b/java/ql/src/semmle/code/java/dataflow/TaintTracking.qll @@ -2,9 +2,9 @@ * Provides classes for performing local (intra-procedural) and * global (inter-procedural) taint-tracking analyses. */ + import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.DataFlow2 - import semmle.code.java.dataflow.internal.TaintTrackingUtil::StringBuilderVarModule module TaintTracking { @@ -14,6 +14,5 @@ module TaintTracking { /** * DEPRECATED: Use TaintTracking2::Configuration instead. */ - deprecated - class Configuration2 = TaintTracking2::Configuration; + deprecated class Configuration2 = TaintTracking2::Configuration; } diff --git a/java/ql/src/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/src/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll index 28ed6c5e86c..e63dcc80416 100644 --- a/java/ql/src/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll +++ b/java/ql/src/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll @@ -252,9 +252,7 @@ private predicate taintPreservingQualifierToMethod(Method m) { m.getName() = "trim" ) or - exists(Class c | c.getQualifiedName() = "java.lang.Number" | - hasSubtype*(c, m.getDeclaringType()) - ) and + exists(Class c | c.getQualifiedName() = "java.lang.Number" | hasSubtype*(c, m.getDeclaringType())) and ( m.getName().matches("to%String") or m.getName() = "toByteArray" or @@ -555,8 +553,8 @@ class ObjectOutputStreamVar extends LocalVariableDecl { result.getMethod().hasName("writeObject") } } - private import StringBuilderVarModule + module StringBuilderVarModule { /** * A local variable that is initialized to a `StringBuilder` diff --git a/java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll index 985768177d4..c4530377a85 100644 --- a/java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll +++ b/java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll @@ -85,4 +85,3 @@ abstract class Configuration extends DataFlow::Configuration { super.hasFlow(source, sink) } } - diff --git a/java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll index 985768177d4..c4530377a85 100644 --- a/java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll +++ b/java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll @@ -85,4 +85,3 @@ abstract class Configuration extends DataFlow::Configuration { super.hasFlow(source, sink) } } - diff --git a/java/ql/src/semmle/code/java/dispatch/ObjFlow.qll b/java/ql/src/semmle/code/java/dispatch/ObjFlow.qll index 401b1224159..c0740a43364 100644 --- a/java/ql/src/semmle/code/java/dispatch/ObjFlow.qll +++ b/java/ql/src/semmle/code/java/dispatch/ObjFlow.qll @@ -6,6 +6,7 @@ * The set of dispatch targets for `Object.toString()` calls are reduced based * on possible data flow from objects of more specific types to the qualifier. */ + import java private import VirtualDispatch private import semmle.code.java.controlflow.Guards diff --git a/java/ql/test/library-tests/frameworks/android/manifest/manifest.ql b/java/ql/test/library-tests/frameworks/android/manifest/manifest.ql index 7311aa1fdab..e71f8da94a7 100644 --- a/java/ql/test/library-tests/frameworks/android/manifest/manifest.ql +++ b/java/ql/test/library-tests/frameworks/android/manifest/manifest.ql @@ -2,4 +2,5 @@ import java import semmle.code.xml.AndroidManifest from AndroidActivityXmlElement e -select e.getResolvedComponentName(), e.getAnIntentFilterElement().getAnActionElement().getActionName() +select e.getResolvedComponentName(), + e.getAnIntentFilterElement().getAnActionElement().getActionName() diff --git a/java/ql/test/library-tests/frameworks/guice/flow.ql b/java/ql/test/library-tests/frameworks/guice/flow.ql index 8afd4f440ad..eb41b078132 100644 --- a/java/ql/test/library-tests/frameworks/guice/flow.ql +++ b/java/ql/test/library-tests/frameworks/guice/flow.ql @@ -5,9 +5,7 @@ import semmle.code.java.dataflow.TaintTracking class Conf extends TaintTracking::Configuration { Conf() { this = "conf" } - override predicate isSource(DataFlow::Node src) { - src instanceof RemoteFlowSource - } + override predicate isSource(DataFlow::Node src) { src instanceof RemoteFlowSource } override predicate isSink(DataFlow::Node sink) { exists(MethodAccess ma |