Formatting

Benjamin Muskalla · Benjamin Muskalla · commit be150f269b0b · 2021-11-10T16:30:22.000+01:00
diff --git a/java/ql/src/utils/model-generator/CaptureSinkModels.ql b/java/ql/src/utils/model-generator/CaptureSinkModels.ql
@@ -21,7 +21,7 @@ class PropagateToSinkConfiguration extends TaintTracking::Configuration {
     isRelevantForModels(source.getEnclosingCallable())
   }
 
-  override predicate isSink(DataFlow::Node sink) { sinkNode(sink, _)}
+  override predicate isSink(DataFlow::Node sink) { sinkNode(sink, _) }
 }
 
 string asInputArgument(DataFlow::Node source) {
@@ -38,6 +38,5 @@ string captureSink(Callable api) {
 }
 
 from TargetAPI api, string sink
-where
-  sink = captureSink(api)
+where sink = captureSink(api)
 select sink order by sink
diff --git a/java/ql/src/utils/model-generator/CaptureSourceModels.ql b/java/ql/src/utils/model-generator/CaptureSourceModels.ql
@@ -48,6 +48,5 @@ string captureSource(Callable api) {
 }
 
 from TargetAPI api, string sink
-where
-  sink = captureSource(api) 
+where sink = captureSource(api)
 select sink order by sink
diff --git a/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll b/java/ql/src/utils/model-generator/ModelGeneratorUtils.qll
@@ -9,10 +9,11 @@ class TargetAPI extends Callable {
     this.getDeclaringType().isPublic() and
     isRelevantForModels(this)
   }
-  
 }
 
-private string isExtensible(RefType ref) { if ref.isFinal() then result = "false" else result = "true" }
+private string isExtensible(RefType ref) {
+  if ref.isFinal() then result = "false" else result = "true"
+}
 
 predicate isRelevantForModels(Callable api) {
   not isInTestFile(api.getCompilationUnit().getFile()) and
@@ -26,7 +27,9 @@ private predicate isInTestFile(File file) {
 }
 
 private predicate isJdkInternal(CompilationUnit cu) {
-  cu.getPackage().getName().matches("com.sun") or cu.getPackage().getName().matches("sun") or cu.getPackage().getName().matches("")
+  cu.getPackage().getName().matches("com.sun") or
+  cu.getPackage().getName().matches("sun") or
+  cu.getPackage().getName().matches("")
 }
 
 bindingset[input, output]
@@ -81,4 +84,4 @@ string parameterAccess(Parameter p) {
     if p.getType() instanceof ContainerType
     then result = "Element of Argument[" + p.getPosition() + "]"
     else result = "Argument[" + p.getPosition() + "]"
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class PropagateToSinkConfiguration extends TaintTracking::Configuration {`
`21`	`21`	`isRelevantForModels(source.getEnclosingCallable())`
`22`	`22`	`}`
`23`	`23`
`24`		`- override predicate isSink(DataFlow::Node sink) { sinkNode(sink, _)}`
	`24`	`+ override predicate isSink(DataFlow::Node sink) { sinkNode(sink, _) }`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`string asInputArgument(DataFlow::Node source) {`
`@@ -38,6 +38,5 @@ string captureSink(Callable api) {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`from TargetAPI api, string sink`
`41`		`-where`
`42`		`- sink = captureSink(api)`
	`41`	`+where sink = captureSink(api)`
`43`	`42`	`select sink order by sink`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,5 @@ string captureSource(Callable api) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`from TargetAPI api, string sink`
`51`		`-where`
`52`		`- sink = captureSource(api)`
	`51`	`+where sink = captureSource(api)`
`53`	`52`	`select sink order by sink`