C#: Rename CallableMethod to Endpoint

Author: koesie10

csharp/ql/src/utils/modeleditor/AutomodelVsCode.qll

@@ -12,7 +12,6 @@ private import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSumma
 private import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
 private import semmle.code.csharp.frameworks.Test
 private import semmle.code.csharp.security.dataflow.flowsources.Remote
-
 private import Telemetry.TestLibrary
 
 /** Holds if the given callable is not worth supporting. */
@@ -25,8 +24,8 @@ private predicate isUninteresting(DotNet::Callable c) {
 /**
  * An callable method from either the C# Standard Library, a 3rd party library, or from the source.
  */
-class CallableMethod extends DotNet::Callable {
-  CallableMethod() {
+class Endpoint extends DotNet::Callable {
+  Endpoint() {
     [this.(Modifiable), this.(Accessor).getDeclaration()].isEffectivelyPublic() and
     not isUninteresting(this)
   }
@@ -121,23 +120,23 @@ class CallableMethod extends DotNet::Callable {
   }
 }
 
-boolean isSupported(CallableMethod callableMethod) {
-  callableMethod.isSupported() and result = true
+boolean isSupported(Endpoint endpoint) {
+  endpoint.isSupported() and result = true
   or
-  not callableMethod.isSupported() and
+  not endpoint.isSupported() and
   result = false
 }
 
-string supportedType(CallableMethod method) {
-  method.isSink() and result = "sink"
+string supportedType(Endpoint endpoint) {
+  endpoint.isSink() and result = "sink"
   or
-  method.isSource() and result = "source"
+  endpoint.isSource() and result = "source"
   or
-  method.hasSummary() and result = "summary"
+  endpoint.hasSummary() and result = "summary"
   or
-  method.isNeutral() and result = "neutral"
+  endpoint.isNeutral() and result = "neutral"
   or
-  not method.isSupported() and result = ""
+  not endpoint.isSupported() and result = ""
 }
 
 string methodClassification(Call method) {

csharp/ql/src/utils/modeleditor/FetchApplicationModeMethods.ql

@@ -10,22 +10,23 @@
 private import csharp
 private import AutomodelVsCode
 
-class ExternalApi extends CallableMethod {
-  ExternalApi() {
+class ExternalEndpoint extends Endpoint {
+  ExternalEndpoint() {
     this.isUnboundDeclaration() and
     this.fromLibrary()
   }
 }
 
-private Call aUsage(ExternalApi api) { result.getTarget().getUnboundDeclaration() = api }
+private Call aUsage(ExternalEndpoint api) { result.getTarget().getUnboundDeclaration() = api }
 
 from
-  ExternalApi api, string apiName, boolean supported, Call usage, string type, string classification
+  ExternalEndpoint endpoint, string apiName, boolean supported, Call usage, string type,
+  string classification
 where
-  apiName = api.getApiName() and
-  supported = isSupported(api) and
-  usage = aUsage(api) and
-  type = supportedType(api) and
+  apiName = endpoint.getApiName() and
+  supported = isSupported(endpoint) and
+  usage = aUsage(endpoint) and
+  type = supportedType(endpoint) and
   classification = methodClassification(usage)
-select usage, apiName, supported.toString(), "supported", api.dllName(), api.dllVersion(), type,
-  "type", classification, "classification"
+select usage, apiName, supported.toString(), "supported", endpoint.dllName(), endpoint.dllVersion(),
+  type, "type", classification, "classification"

csharp/ql/src/utils/modeleditor/FetchFrameworkModeMethods.ql

@@ -12,14 +12,14 @@ private import dotnet
 private import semmle.code.csharp.frameworks.Test
 private import AutomodelVsCode
 
-class PublicMethod extends CallableMethod {
-  PublicMethod() { this.fromSource() and not this.getFile() instanceof TestFile }
+class PublicEndpointFromSource extends Endpoint {
+  PublicEndpointFromSource() { this.fromSource() and not this.getFile() instanceof TestFile }
 }
 
-from PublicMethod publicMethod, string apiName, boolean supported, string type
+from PublicEndpointFromSource endpoint, string apiName, boolean supported, string type
 where
-  apiName = publicMethod.getApiName() and
-  supported = isSupported(publicMethod) and
-  type = supportedType(publicMethod)
-select publicMethod, apiName, supported.toString(), "supported",
-  publicMethod.getFile().getBaseName(), "library", type, "type", "unknown", "classification"
+  apiName = endpoint.getApiName() and
+  supported = isSupported(endpoint) and
+  type = supportedType(endpoint)
+select endpoint, apiName, supported.toString(), "supported", endpoint.getFile().getBaseName(),
+  "library", type, "type", "unknown", "classification"