From f7ad89449527ca59adee723c19e2c8d8539e7a2b Mon Sep 17 00:00:00 2001 From: Benjamin Muskalla Date: Tue, 7 Sep 2021 14:28:58 +0200 Subject: [PATCH] Fix name of api filter predicate --- java/ql/src/Telemetry/ExternalAPI.qll | 2 +- java/ql/src/Telemetry/ExternalLibraryUsage.ql | 2 +- java/ql/src/Telemetry/SupportedExternalSinks.ql | 2 +- java/ql/src/Telemetry/SupportedExternalSources.ql | 2 +- java/ql/src/Telemetry/SupportedExternalTaint.ql | 2 +- java/ql/src/Telemetry/UnsupportedExternalAPIs.ql | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/ql/src/Telemetry/ExternalAPI.qll b/java/ql/src/Telemetry/ExternalAPI.qll index 1b1385c4266..da72f0120a3 100644 --- a/java/ql/src/Telemetry/ExternalAPI.qll +++ b/java/ql/src/Telemetry/ExternalAPI.qll @@ -16,7 +16,7 @@ class ExternalAPI extends Callable { ExternalAPI() { not this.fromSource() } /** Holds if this API is a candidate worth supporting */ - predicate isWorthSupporting() { not isTestLibrary() and not isParameterlessConstructor() } + predicate isUninteresting() { isTestLibrary() or isParameterlessConstructor() } /** Holds if this API is is a constructor without parameters */ predicate isParameterlessConstructor() { diff --git a/java/ql/src/Telemetry/ExternalLibraryUsage.ql b/java/ql/src/Telemetry/ExternalLibraryUsage.ql index ad6bf6a91b1..5a1baf7341f 100644 --- a/java/ql/src/Telemetry/ExternalLibraryUsage.ql +++ b/java/ql/src/Telemetry/ExternalLibraryUsage.ql @@ -16,6 +16,6 @@ where c.getCallee() = a and not c.getFile() instanceof GeneratedFile and a.jarContainer() = jarname and - a.isWorthSupporting() + not a.isUninteresting() ) select jarname, usages order by usages desc diff --git a/java/ql/src/Telemetry/SupportedExternalSinks.ql b/java/ql/src/Telemetry/SupportedExternalSinks.ql index 9f7d3faac25..e4d16c124de 100644 --- a/java/ql/src/Telemetry/SupportedExternalSinks.ql +++ b/java/ql/src/Telemetry/SupportedExternalSinks.ql @@ -12,7 +12,7 @@ import semmle.code.java.GeneratedFiles from ExternalAPI api, int usages where - api.isWorthSupporting() and + not api.isUninteresting() and api.isSink() and usages = strictcount(Call c | diff --git a/java/ql/src/Telemetry/SupportedExternalSources.ql b/java/ql/src/Telemetry/SupportedExternalSources.ql index 2db7790b230..731f1a93b54 100644 --- a/java/ql/src/Telemetry/SupportedExternalSources.ql +++ b/java/ql/src/Telemetry/SupportedExternalSources.ql @@ -12,7 +12,7 @@ import semmle.code.java.GeneratedFiles from ExternalAPI api, int usages where - api.isWorthSupporting() and + not api.isUninteresting() and api.isSource() and usages = strictcount(Call c | diff --git a/java/ql/src/Telemetry/SupportedExternalTaint.ql b/java/ql/src/Telemetry/SupportedExternalTaint.ql index 25c849545e6..4da713e951e 100644 --- a/java/ql/src/Telemetry/SupportedExternalTaint.ql +++ b/java/ql/src/Telemetry/SupportedExternalTaint.ql @@ -12,7 +12,7 @@ import semmle.code.java.GeneratedFiles from ExternalAPI api, int usages where - api.isWorthSupporting() and + not api.isUninteresting() and api.hasSummary() and usages = strictcount(Call c | diff --git a/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql b/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql index ae038cfa4db..cca76491eab 100644 --- a/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql +++ b/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql @@ -12,7 +12,7 @@ import semmle.code.java.GeneratedFiles from ExternalAPI api, int usages where - api.isWorthSupporting() and + not api.isUninteresting() and not api.isSupported() and usages = strictcount(Call c |