patch upper-case acronyms to be PascalCase

java/ql/src/utils/model-generator/CaptureSinkModels.ql

@@ -43,7 +43,7 @@ string asInputArgument(DataFlow::Node source) {
   result = "Argument[-1]"
 }
 
-string captureSink(TargetAPI api) {
+string captureSink(TargetApi api) {
   exists(DataFlow::Node src, DataFlow::Node sink, PropagateToSinkConfiguration config, string kind |
     config.hasFlow(src, sink) and
     sinkNode(sink, kind) and
@@ -53,6 +53,6 @@ string captureSink(TargetAPI api) {
   )
 }
 
-from TargetAPI api, string sink
+from TargetApi api, string sink
 where sink = captureSink(api)
 select sink order by sink

java/ql/src/utils/model-generator/CaptureSourceModels.ql

@@ -22,7 +22,7 @@ class FromSourceConfiguration extends TaintTracking::Configuration {
   override predicate isSource(DataFlow::Node source) { sourceNode(source, _) }
 
   override predicate isSink(DataFlow::Node sink) {
-    exists(TargetAPI c |
+    exists(TargetApi c |
       sink instanceof ReturnNodeExt and
       sink.getEnclosingCallable() = c and
       c.isPublic() and
@@ -39,7 +39,7 @@ class FromSourceConfiguration extends TaintTracking::Configuration {
   }
 }
 
-string captureSource(TargetAPI api) {
+string captureSource(TargetApi api) {
   exists(DataFlow::Node source, DataFlow::Node sink, FromSourceConfiguration config, string kind |
     config.hasFlow(source, sink) and
     sourceNode(source, kind) and
@@ -48,6 +48,6 @@ string captureSource(TargetAPI api) {
   )
 }
 
-from TargetAPI api, string sink
+from TargetApi api, string sink
 where sink = captureSource(api)
 select sink order by sink

java/ql/src/utils/model-generator/CaptureSummaryModels.ql

@@ -12,7 +12,7 @@ import semmle.code.java.dataflow.internal.DataFlowPrivate
 import semmle.code.java.dataflow.InstanceAccess
 import ModelGeneratorUtils
 
-string captureFlow(TargetAPI api) {
+string captureFlow(TargetApi api) {
   result = captureQualifierFlow(api) or
   result = captureThroughFlow(api)
 }
@@ -29,7 +29,7 @@ string captureFlow(TargetAPI api) {
  * }
  * ```
  */
-string captureQualifierFlow(TargetAPI api) {
+string captureQualifierFlow(TargetApi api) {
   exists(ReturnStmt rtn |
     rtn.getEnclosingCallable() = api and
     rtn.getResult().(ThisAccess).isOwnInstanceAccess()
@@ -50,7 +50,7 @@ class ThroughFlowConfig extends TaintTracking::Configuration {
 
   override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) {
     source instanceof DataFlow::ParameterNode and
-    source.getEnclosingCallable() instanceof TargetAPI and
+    source.getEnclosingCallable() instanceof TargetApi and
     state instanceof TaintRead
   }
 
@@ -145,7 +145,7 @@ class ThroughFlowConfig extends TaintTracking::Configuration {
  * Captured Model:
  * `p;Foo;true;addToList;;Argument[0];Argument[1];taint`
  */
-string captureThroughFlow(TargetAPI api) {
+string captureThroughFlow(TargetApi api) {
   exists(
     ThroughFlowConfig config, DataFlow::ParameterNode p, ReturnNodeExt returnNodeExt, string input,
     string output
@@ -159,6 +159,6 @@ string captureThroughFlow(TargetAPI api) {
   )
 }
 
-from TargetAPI api, string flow
+from TargetApi api, string flow
 where flow = captureFlow(api)
 select flow order by flow

java/ql/src/utils/model-generator/ModelGeneratorUtils.qll

@@ -11,8 +11,8 @@ Method superImpl(Method m) {
   not m instanceof ToStringMethod
 }
 
-class TargetAPI extends Callable {
-  TargetAPI() {
+class TargetApi extends Callable {
+  TargetApi() {
     this.isPublic() and
     this.fromSource() and
     (
@@ -23,6 +23,9 @@ class TargetAPI extends Callable {
   }
 }
 
+/** DEPRECATED: Alias for TargetApi */
+deprecated class TargetAPI = TargetApi;
+
 private string isExtensible(RefType ref) {
   if ref.isFinal() then result = "false" else result = "true"
 }
@@ -59,17 +62,17 @@ private predicate isJdkInternal(CompilationUnit cu) {
 }
 
 bindingset[input, output]
-string asTaintModel(TargetAPI api, string input, string output) {
+string asTaintModel(TargetApi api, string input, string output) {
   result = asSummaryModel(api, input, output, "taint")
 }
 
 bindingset[input, output]
-string asValueModel(TargetAPI api, string input, string output) {
+string asValueModel(TargetApi api, string input, string output) {
   result = asSummaryModel(api, input, output, "value")
 }
 
 bindingset[input, output, kind]
-string asSummaryModel(TargetAPI api, string input, string output, string kind) {
+string asSummaryModel(TargetApi api, string input, string output, string kind) {
   result =
     asPartialModel(api) + input + ";" //
       + output + ";" //
@@ -77,19 +80,19 @@ string asSummaryModel(TargetAPI api, string input, string output, string kind) {
 }
 
 bindingset[input, kind]
-string asSinkModel(TargetAPI api, string input, string kind) {
+string asSinkModel(TargetApi api, string input, string kind) {
   result = asPartialModel(api) + input + ";" + kind
 }
 
 bindingset[output, kind]
-string asSourceModel(TargetAPI api, string output, string kind) {
+string asSourceModel(TargetApi api, string output, string kind) {
   result = asPartialModel(api) + output + ";" + kind
 }
 
 /**
  * Computes the first 6 columns for CSV rows.
  */
-private string asPartialModel(TargetAPI api) {
+private string asPartialModel(TargetApi api) {
   result =
     typeAsSummaryModel(api) + ";" //
       + isExtensible(bestTypeForModel(api)) + ";" //
@@ -102,9 +105,9 @@ private string asPartialModel(TargetAPI api) {
  * Returns the appropriate type name for the model. Either the type
  * declaring the method or the supertype introducing the method.
  */
-private string typeAsSummaryModel(TargetAPI api) { result = typeAsModel(bestTypeForModel(api)) }
+private string typeAsSummaryModel(TargetApi api) { result = typeAsModel(bestTypeForModel(api)) }
 
-private RefType bestTypeForModel(TargetAPI api) {
+private RefType bestTypeForModel(TargetApi api) {
   if exists(superImpl(api))
   then superImpl(api).fromSource() and result = superImpl(api).getDeclaringType()
   else result = api.getDeclaringType()