Skip to content

Commit 1e5c9e8

Browse files
author
Stephan Brandauer
committed
simplify by using hasQualifiedName
1 parent f43edb8 commit 1e5c9e8

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

java/ql/src/Telemetry/AutomodelFrameworkModeCharacteristics.qll

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,30 +79,23 @@ module FrameworkCandidatesImpl implements SharedCharacteristics::CandidateSig {
7979
}
8080

8181
predicate isSink(Endpoint e, string kind) {
82-
exists(
83-
string package, string type, boolean subtypes, string name, string signature, string ext,
84-
string input
85-
|
86-
sinkSpec(e, package, type, subtypes, name, signature, ext, input) and
87-
ExternalFlow::sinkModel(package, type, subtypes, name, [signature, ""], ext, input, kind, _)
82+
exists(string package, string type, string name, string signature, string ext, string input |
83+
sinkSpec(e, package, type, name, signature, ext, input) and
84+
ExternalFlow::sinkModel(package, type, _, name, [signature, ""], ext, input, kind, _)
8885
)
8986
}
9087

9188
predicate isNeutral(Endpoint e) {
9289
exists(string package, string type, string name, string signature |
93-
sinkSpec(e, package, type, _, name, signature, _, _) and
90+
sinkSpec(e, package, type, name, signature, _, _) and
9491
ExternalFlow::neutralModel(package, type, name, [signature, ""], _)
9592
)
9693
}
9794

9895
additional predicate sinkSpec(
99-
Endpoint e, string package, string type, boolean subtypes, string name, string signature,
100-
string ext, string input
96+
Endpoint e, string package, string type, string name, string signature, string ext, string input
10197
) {
102-
package = FrameworkCandidatesImpl::getCallable(e).getDeclaringType().getPackage().toString() and
103-
type = FrameworkCandidatesImpl::getCallable(e).getDeclaringType().getName() and
104-
subtypes = false and
105-
name = FrameworkCandidatesImpl::getCallable(e).getName() and
98+
FrameworkCandidatesImpl::getCallable(e).hasQualifiedName(package, type, name) and
10699
signature = ExternalFlow::paramsString(getCallable(e)) and
107100
ext = "" and
108101
exists(int paramIdx | e.isParameterOf(_, paramIdx) | input = "Argument[" + paramIdx + "]")

0 commit comments

Comments
 (0)