Rename a predicate.

Author: Max Schaefer

java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll

@@ -83,7 +83,7 @@ abstract class FrameworkModeEndpoint extends TFrameworkModeEndpoint {
   /**
    * Returns the callable that contains the endpoint.
    */
-  abstract Callable getEnclosingCallable();
+  abstract Callable getCallable();
 
   abstract Top asTop();
 
@@ -117,7 +117,7 @@ class ExplicitParameterEndpoint extends FrameworkModeEndpoint, TExplicitParamete
 
   override string getParamName() { result = param.getName() }
 
-  override Callable getEnclosingCallable() { result = param.getCallable() }
+  override Callable getCallable() { result = param.getCallable() }
 
   override Top asTop() { result = param }
 
@@ -137,7 +137,7 @@ class QualifierEndpoint extends FrameworkModeEndpoint, TQualifier {
 
   override string getParamName() { result = "this" }
 
-  override Callable getEnclosingCallable() { result = callable }
+  override Callable getCallable() { result = callable }
 
   override Top asTop() { result = callable }
 
@@ -155,7 +155,7 @@ class ReturnValue extends FrameworkModeEndpoint, TReturnValue {
 
   override string getParamName() { none() }
 
-  override Callable getEnclosingCallable() { result = callable }
+  override Callable getCallable() { result = callable }
 
   override Top asTop() { result = callable }
 
@@ -174,7 +174,7 @@ class OverridableParameter extends FrameworkModeEndpoint, TOverridableParameter
 
   override string getParamName() { result = param.getName() }
 
-  override Callable getEnclosingCallable() { result = method }
+  override Callable getCallable() { result = method }
 
   override Top asTop() { result = param }
 
@@ -192,7 +192,7 @@ class OverridableQualifier extends FrameworkModeEndpoint, TOverridableQualifier
 
   override string getParamName() { result = "this" }
 
-  override Callable getEnclosingCallable() { result = m }
+  override Callable getCallable() { result = m }
 
   override Top asTop() { result = m }
 
@@ -257,8 +257,8 @@ module FrameworkCandidatesImpl implements SharedCharacteristics::CandidateSig {
   additional predicate sinkSpec(
     Endpoint e, string package, string type, string name, string signature, string ext, string input
   ) {
-    e.getEnclosingCallable().hasQualifiedName(package, type, name) and
-    signature = ExternalFlow::paramsString(e.getEnclosingCallable()) and
+    e.getCallable().hasQualifiedName(package, type, name) and
+    signature = ExternalFlow::paramsString(e.getCallable()) and
     ext = "" and
     input = e.getMaDInput()
   }
@@ -267,8 +267,8 @@ module FrameworkCandidatesImpl implements SharedCharacteristics::CandidateSig {
     Endpoint e, string package, string type, string name, string signature, string ext,
     string output
   ) {
-    e.getEnclosingCallable().hasQualifiedName(package, type, name) and
-    signature = ExternalFlow::paramsString(e.getEnclosingCallable()) and
+    e.getCallable().hasQualifiedName(package, type, name) and
+    signature = ExternalFlow::paramsString(e.getCallable()) and
     ext = "" and
     output = e.getMaDOutput()
   }
@@ -280,10 +280,10 @@ module FrameworkCandidatesImpl implements SharedCharacteristics::CandidateSig {
    */
   RelatedLocation getRelatedLocation(Endpoint e, RelatedLocationType type) {
     type = MethodDoc() and
-    result = e.getEnclosingCallable().(Documentable).getJavadoc()
+    result = e.getCallable().(Documentable).getJavadoc()
     or
     type = ClassDoc() and
-    result = e.getEnclosingCallable().getDeclaringType().(Documentable).getJavadoc()
+    result = e.getCallable().getDeclaringType().(Documentable).getJavadoc()
   }
 }
 
@@ -308,13 +308,13 @@ class FrameworkModeMetadataExtractor extends string {
     string input, string output, string parameterName
   ) {
     (if exists(e.getParamName()) then parameterName = e.getParamName() else parameterName = "") and
-    name = e.getEnclosingCallable().getName() and
+    name = e.getCallable().getName() and
     (if exists(e.getMaDInput()) then input = e.getMaDInput() else input = "") and
     (if exists(e.getMaDOutput()) then output = e.getMaDOutput() else output = "") and
-    package = e.getEnclosingCallable().getDeclaringType().getPackage().getName() and
-    type = e.getEnclosingCallable().getDeclaringType().getErasure().(RefType).nestedName() and
-    subtypes = AutomodelJavaUtil::considerSubtypes(e.getEnclosingCallable()).toString() and
-    signature = ExternalFlow::paramsString(e.getEnclosingCallable())
+    package = e.getCallable().getDeclaringType().getPackage().getName() and
+    type = e.getCallable().getDeclaringType().getErasure().(RefType).nestedName() and
+    subtypes = AutomodelJavaUtil::considerSubtypes(e.getCallable()).toString() and
+    signature = ExternalFlow::paramsString(e.getCallable())
   }
 }
 
@@ -336,8 +336,8 @@ private class UnexploitableIsCharacteristic extends CharacteristicsImpl::Neither
   UnexploitableIsCharacteristic() { this = "unexploitable (is-style boolean method)" }
 
   override predicate appliesToEndpoint(Endpoint e) {
-    e.getEnclosingCallable().getName().matches("is%") and
-    e.getEnclosingCallable().getReturnType() instanceof BooleanType and
+    e.getCallable().getName().matches("is%") and
+    e.getCallable().getReturnType() instanceof BooleanType and
     (
       e.getExtensibleType() = "sinkModel" and
       not FrameworkCandidatesImpl::isSink(e, _, _)
@@ -362,11 +362,11 @@ private class UnexploitableExistsCharacteristic extends CharacteristicsImpl::Nei
 
   override predicate appliesToEndpoint(Endpoint e) {
     exists(Callable callable |
-      callable = e.getEnclosingCallable() and
+      callable = e.getCallable() and
       callable.getName().toLowerCase() = ["exists", "notexists"] and
       callable.getReturnType() instanceof BooleanType
     |
-      e.getExtensibleType() = "sourceModel" and
+      e.getExtensibleType() = "sinkModel" and
       not FrameworkCandidatesImpl::isSink(e, _, _)
       or
       e.getExtensibleType() = "sourceModel" and
@@ -384,7 +384,7 @@ private class ExceptionCharacteristic extends CharacteristicsImpl::NeitherSource
   ExceptionCharacteristic() { this = "exception" }
 
   override predicate appliesToEndpoint(Endpoint e) {
-    e.getEnclosingCallable().getDeclaringType().getASupertype*() instanceof TypeThrowable and
+    e.getCallable().getDeclaringType().getASupertype*() instanceof TypeThrowable and
     (
       e.getExtensibleType() = "sinkModel" and
       not FrameworkCandidatesImpl::isSink(e, _, _)
@@ -405,6 +405,6 @@ private class NotAModelApi extends CharacteristicsImpl::UninterestingToModelChar
   NotAModelApi() { this = "not a model API" }
 
   override predicate appliesToEndpoint(Endpoint e) {
-    not e.getEnclosingCallable() instanceof ModelExclusions::ModelApi
+    not e.getCallable() instanceof ModelExclusions::ModelApi
   }
 }