Skip to content

Commit f48cc9f

Browse files
Jami CogswellJami Cogswell
authored andcommitted
Java: remove previous uses of isUninteresting
1 parent 29046e7 commit f48cc9f

File tree

6 files changed

+6
-20
lines changed

6 files changed

+6
-20
lines changed

java/ql/src/Telemetry/ExternalLibraryUsage.ql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ private predicate getRelevantUsages(string jarname, int usages) {
1414
strictcount(Call c, ExternalApi a |
1515
c.getCallee().getSourceDeclaration() = a and
1616
not c.getFile() instanceof GeneratedFile and
17-
a.jarContainer() = jarname and
18-
not a.isUninteresting()
17+
a.jarContainer() = jarname
1918
)
2019
}
2120

java/ql/src/Telemetry/SupportedExternalApis.ql

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
1111
import ExternalApi
1212

1313
private predicate relevant(ExternalApi api) {
14-
not api.isUninteresting() and
15-
(
16-
api.isSupported() or
17-
api = any(FlowSummaryImpl::Public::NegativeSummarizedCallable nsc).asCallable()
18-
)
14+
api.isSupported() or
15+
api = any(FlowSummaryImpl::Public::NegativeSummarizedCallable nsc).asCallable()
1916
}
2017

2118
from string apiName, int usages

java/ql/src/Telemetry/SupportedExternalSinks.ql

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
import java
1010
import ExternalApi
1111

12-
private predicate relevant(ExternalApi api) {
13-
not api.isUninteresting() and
14-
api.isSink()
15-
}
12+
private predicate relevant(ExternalApi api) { api.isSink() }
1613

1714
from string apiName, int usages
1815
where Results<relevant/1>::restrict(apiName, usages)

java/ql/src/Telemetry/SupportedExternalSources.ql

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
import java
1010
import ExternalApi
1111

12-
private predicate relevant(ExternalApi api) {
13-
not api.isUninteresting() and
14-
api.isSource()
15-
}
12+
private predicate relevant(ExternalApi api) { api.isSource() }
1613

1714
from string apiName, int usages
1815
where Results<relevant/1>::restrict(apiName, usages)

java/ql/src/Telemetry/SupportedExternalTaint.ql

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
import java
1010
import ExternalApi
1111

12-
private predicate relevant(ExternalApi api) {
13-
not api.isUninteresting() and
14-
api.hasSummary()
15-
}
12+
private predicate relevant(ExternalApi api) { api.hasSummary() }
1613

1714
from string apiName, int usages
1815
where Results<relevant/1>::restrict(apiName, usages)

java/ql/src/Telemetry/UnsupportedExternalAPIs.ql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
1111
import ExternalApi
1212

1313
private predicate relevant(ExternalApi api) {
14-
not api.isUninteresting() and
1514
not api.isSupported() and
1615
not api = any(FlowSummaryImpl::Public::NegativeSummarizedCallable nsc).asCallable()
1716
}

0 commit comments

Comments
 (0)