From a1908be16587b7aa52353af20605c958947d33d8 Mon Sep 17 00:00:00 2001
From: Jami Cogswell <jcogs33@Jamis-MacBook-Pro.local>
Date: Thu, 8 Dec 2022 17:12:26 -0500
Subject: [PATCH] C#: remove previous uses of isUninteresting

---
 csharp/ql/src/Telemetry/ExternalLibraryUsage.ql          | 3 +--
 csharp/ql/src/Telemetry/SupportedExternalApis.ql         | 7 ++-----
 csharp/ql/src/Telemetry/SupportedExternalSinks.ql        | 5 +----
 csharp/ql/src/Telemetry/SupportedExternalSources.ql      | 5 +----
 csharp/ql/src/Telemetry/SupportedExternalTaint.ql        | 5 +----
 csharp/ql/src/Telemetry/UnsupportedExternalAPIs.ql       | 1 -
 csharp/ql/src/meta/frameworks/UnsupportedExternalAPIs.ql | 1 -
 7 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql b/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql
index f06a18054dc..f28fa1c76fb 100644
--- a/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql
+++ b/csharp/ql/src/Telemetry/ExternalLibraryUsage.ql
@@ -14,8 +14,7 @@ private predicate getRelevantUsages(string namespace, int usages) {
   usages =
     strictcount(Call c, ExternalApi api |
       c.getTarget().getUnboundDeclaration() = api and
-      api.getNamespace() = namespace and
-      not api.isUninteresting()
+      api.getNamespace() = namespace
     )
 }
 
diff --git a/csharp/ql/src/Telemetry/SupportedExternalApis.ql b/csharp/ql/src/Telemetry/SupportedExternalApis.ql
index 039f2a24677..cf0c1868a97 100644
--- a/csharp/ql/src/Telemetry/SupportedExternalApis.ql
+++ b/csharp/ql/src/Telemetry/SupportedExternalApis.ql
@@ -12,11 +12,8 @@ private import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSumma
 private import ExternalApi
 
 private predicate relevant(ExternalApi api) {
-  not api.isUninteresting() and
-  (
-    api.isSupported() or
-    api instanceof FlowSummaryImpl::Public::NegativeSummarizedCallable
-  )
+  api.isSupported() or
+  api instanceof FlowSummaryImpl::Public::NegativeSummarizedCallable
 }
 
 from string info, int usages
diff --git a/csharp/ql/src/Telemetry/SupportedExternalSinks.ql b/csharp/ql/src/Telemetry/SupportedExternalSinks.ql
index 4eb42c4628f..542834bc057 100644
--- a/csharp/ql/src/Telemetry/SupportedExternalSinks.ql
+++ b/csharp/ql/src/Telemetry/SupportedExternalSinks.ql
@@ -10,10 +10,7 @@ private import csharp
 private import semmle.code.csharp.dispatch.Dispatch
 private import ExternalApi
 
-private predicate relevant(ExternalApi api) {
-  not api.isUninteresting() and
-  api.isSink()
-}
+private predicate relevant(ExternalApi api) { api.isSink() }
 
 from string info, int usages
 where Results<relevant/1>::restrict(info, usages)
diff --git a/csharp/ql/src/Telemetry/SupportedExternalSources.ql b/csharp/ql/src/Telemetry/SupportedExternalSources.ql
index 0d0b38a4754..d2293b2d3cf 100644
--- a/csharp/ql/src/Telemetry/SupportedExternalSources.ql
+++ b/csharp/ql/src/Telemetry/SupportedExternalSources.ql
@@ -10,10 +10,7 @@ private import csharp
 private import semmle.code.csharp.dispatch.Dispatch
 private import ExternalApi
 
-private predicate relevant(ExternalApi api) {
-  not api.isUninteresting() and
-  api.isSource()
-}
+private predicate relevant(ExternalApi api) { api.isSource() }
 
 from string info, int usages
 where Results<relevant/1>::restrict(info, usages)
diff --git a/csharp/ql/src/Telemetry/SupportedExternalTaint.ql b/csharp/ql/src/Telemetry/SupportedExternalTaint.ql
index 3eccf73b58b..a76467f0142 100644
--- a/csharp/ql/src/Telemetry/SupportedExternalTaint.ql
+++ b/csharp/ql/src/Telemetry/SupportedExternalTaint.ql
@@ -10,10 +10,7 @@ private import csharp
 private import semmle.code.csharp.dispatch.Dispatch
 private import ExternalApi
 
-private predicate relevant(ExternalApi api) {
-  not api.isUninteresting() and
-  api.hasSummary()
-}
+private predicate relevant(ExternalApi api) { api.hasSummary() }
 
 from string info, int usages
 where Results<relevant/1>::restrict(info, usages)
diff --git a/csharp/ql/src/Telemetry/UnsupportedExternalAPIs.ql b/csharp/ql/src/Telemetry/UnsupportedExternalAPIs.ql
index 618f26e6636..b9adafe4b2a 100644
--- a/csharp/ql/src/Telemetry/UnsupportedExternalAPIs.ql
+++ b/csharp/ql/src/Telemetry/UnsupportedExternalAPIs.ql
@@ -12,7 +12,6 @@ private import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSumma
 private import ExternalApi
 
 private predicate relevant(ExternalApi api) {
-  not api.isUninteresting() and
   not api.isSupported() and
   not api instanceof FlowSummaryImpl::Public::NegativeSummarizedCallable
 }
diff --git a/csharp/ql/src/meta/frameworks/UnsupportedExternalAPIs.ql b/csharp/ql/src/meta/frameworks/UnsupportedExternalAPIs.ql
index 4eef46ef86b..7ad5f66eece 100644
--- a/csharp/ql/src/meta/frameworks/UnsupportedExternalAPIs.ql
+++ b/csharp/ql/src/meta/frameworks/UnsupportedExternalAPIs.ql
@@ -16,7 +16,6 @@ private import Telemetry.ExternalApi
 from Call c, ExternalApi api
 where
   c.getTarget().getUnboundDeclaration() = api and
-  not api.isUninteresting() and
   not api.isSupported() and
   not api instanceof FlowSummaryImpl::Public::NegativeSummarizedCallable
 select c, "Call to unsupported external API $@.", api, api.toString()