mirror of
https://github.com/github/codeql.git
synced 2026-04-29 10:45:15 +02:00
Java: Model java.util.Optional lambda methods
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
This commit is contained in:
@@ -15,7 +15,16 @@ private class OptionalModel extends SummaryModelCsv {
|
||||
"java.util;Optional;false;orElse;;;Argument[0];ReturnValue;value",
|
||||
"java.util;Optional;false;orElseGet;;;Element of Argument[-1];ReturnValue;value",
|
||||
"java.util;Optional;false;orElseThrow;;;Element of Argument[-1];ReturnValue;value",
|
||||
"java.util;Optional;false;stream;;;Element of Argument[-1];Element of ReturnValue;value"
|
||||
"java.util;Optional;false;stream;;;Element of Argument[-1];Element of ReturnValue;value",
|
||||
"java.util;Optional;false;ifPresent;;;Element of Argument[-1];Parameter[0] of Argument[0];value",
|
||||
"java.util;Optional;false;ifPresentOrElse;;;Element of Argument[-1];Parameter[0] of Argument[0];value",
|
||||
"java.util;Optional;false;map;;;Element of Argument[-1];Parameter[0] of Argument[0];value",
|
||||
"java.util;Optional;false;map;;;ReturnValue of Argument[0];Element of ReturnValue;value",
|
||||
"java.util;Optional;false;flatMap;;;Element of Argument[-1];Parameter[0] of Argument[0];value",
|
||||
"java.util;Optional;false;flatMap;;;ReturnValue of Argument[0];ReturnValue;value",
|
||||
"java.util;Optional;false;filter;;;Element of Argument[-1];Parameter[0] of Argument[0];value",
|
||||
"java.util;Optional;false;or;;;ReturnValue of Argument[0];ReturnValue;value",
|
||||
"java.util;Optional;false;orElseGet;;;ReturnValue of Argument[0];ReturnValue;value"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
58
java/ql/test/library-tests/optional/FunctionalTest.java
Normal file
58
java/ql/test/library-tests/optional/FunctionalTest.java
Normal file
@@ -0,0 +1,58 @@
|
||||
import java.util.Optional;
|
||||
|
||||
public class FunctionalTest {
|
||||
String source() {
|
||||
return null;
|
||||
}
|
||||
|
||||
void sink(Object o) {
|
||||
}
|
||||
|
||||
void test() {
|
||||
Optional<String> o = Optional.of(source());
|
||||
o.ifPresent(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
});
|
||||
o.ifPresentOrElse(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
}, () -> {
|
||||
// no-op
|
||||
});
|
||||
o.map(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
return v;
|
||||
}).ifPresent(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
});
|
||||
o.flatMap(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
return Optional.of(v);
|
||||
}).ifPresent(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
});
|
||||
o.flatMap(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
return Optional.of("safe");
|
||||
}).ifPresent(v -> {
|
||||
sink(v); // no value flow
|
||||
});
|
||||
o.filter(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
return true;
|
||||
}).ifPresent(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
});
|
||||
Optional.of("safe").map(v -> {
|
||||
sink(v); // no value flow
|
||||
return v;
|
||||
}).or(() -> o).ifPresent(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
});
|
||||
Optional<String> safe = Optional.of("safe");
|
||||
o.or(() -> safe).ifPresent(v -> {
|
||||
sink(v); // $hasValueFlow
|
||||
});
|
||||
String value = safe.orElseGet(() -> source());
|
||||
sink(value); // $hasValueFlow
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user