hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 02:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9343 from smowton/smowton/fix/align-kotlin-java-generic-types

Browse Source 
Kotlin: extract methods defined on collections types with their Java signatures
This commit is contained in:
Chris Smowton
2022-05-30 17:52:58 +01:00
committed by GitHub
parent cd1800ec7e 49d9d8e7d6
commit 1708719fdf
6 changed files with 591 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/Test.java Normal file
View File

@@ -0,0 +1,28 @@
import java.util.Map;
import java.util.AbstractMap;
import java.util.Collection;
import java.util.AbstractCollection;
import java.util.List;
import java.util.AbstractList;
public class Test {
public static void test(
Map<String, String> p1,
AbstractMap<String, String> p2,
Collection<String> p3,
AbstractCollection<String> p4,
List<String> p5,
AbstractList<String> p6) {
// Use a method of each to ensure method prototypes are extracted:
p1.remove("Hello");
p2.remove("Hello");
p3.remove("Hello");
p4.remove("Hello");
p5.remove("Hello");
p6.remove("Hello");
}
}

412
java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.expected Normal file
View File

@@ -0,0 +1,412 @@
methodWithDuplicate
#select
| AbstractCollection | add | E |
| AbstractCollection | addAll | Collection<? extends E> |
| AbstractCollection | contains | Object |
| AbstractCollection | containsAll | Collection<?> |
| AbstractCollection | remove | Object |
| AbstractCollection | removeAll | Collection<?> |
| AbstractCollection | retainAll | Collection<?> |
| AbstractCollection | toArray | T[] |
| AbstractCollection<E> | add | E |
| AbstractCollection<E> | addAll | Collection<? extends E> |
| AbstractCollection<E> | contains | Object |
| AbstractCollection<E> | containsAll | Collection<?> |
| AbstractCollection<E> | remove | Object |
| AbstractCollection<E> | removeAll | Collection<?> |
| AbstractCollection<E> | retainAll | Collection<?> |
| AbstractCollection<E> | toArray | T[] |
| AbstractCollection<String> | add | String |
| AbstractCollection<String> | addAll | Collection<? extends String> |
| AbstractCollection<String> | contains | Object |
| AbstractCollection<String> | containsAll | Collection<?> |
| AbstractCollection<String> | remove | Object |
| AbstractCollection<String> | removeAll | Collection<?> |
| AbstractCollection<String> | retainAll | Collection<?> |
| AbstractCollection<String> | toArray | T[] |
| AbstractList | add | E |
| AbstractList | add | int |
| AbstractList | addAll | Collection<? extends E> |
| AbstractList | addAll | int |
| AbstractList | equals | Object |
| AbstractList | get | int |
| AbstractList | indexOf | Object |
| AbstractList | lastIndexOf | Object |
| AbstractList | listIterator | int |
| AbstractList | removeAt | int |
| AbstractList | removeRange | int |
| AbstractList | set | E |
| AbstractList | set | int |
| AbstractList | subList | int |
| AbstractList | subListRangeCheck | int |
| AbstractList<E> | add | E |
| AbstractList<E> | add | int |
| AbstractList<E> | addAll | Collection<? extends E> |
| AbstractList<E> | addAll | int |
| AbstractList<E> | equals | Object |
| AbstractList<E> | get | int |
| AbstractList<E> | indexOf | Object |
| AbstractList<E> | lastIndexOf | Object |
| AbstractList<E> | listIterator | int |
| AbstractList<E> | removeAt | int |
| AbstractList<E> | removeRange | int |
| AbstractList<E> | set | E |
| AbstractList<E> | set | int |
| AbstractList<E> | subList | int |
| AbstractList<E> | subListRangeCheck | int |
| AbstractMap | containsEntry | Entry<?,?> |
| AbstractMap | containsKey | Object |
| AbstractMap | containsValue | Object |
| AbstractMap | equals | Object |
| AbstractMap | get | Object |
| AbstractMap | put | K |
| AbstractMap | put | V |
| AbstractMap | putAll | Map<? extends K,? extends V> |
| AbstractMap | remove | Object |
| AbstractMap<Identity,Entry<?>> | containsKey | Object |
| AbstractMap<Identity,Entry<?>> | containsValue | Object |
| AbstractMap<Identity,Entry<?>> | equals | Object |
| AbstractMap<Identity,Entry<?>> | get | Object |
| AbstractMap<Identity,Entry<?>> | put | Entry<?> |
| AbstractMap<Identity,Entry<?>> | put | Identity |
| AbstractMap<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
| AbstractMap<Identity,Entry<?>> | remove | Object |
| AbstractMap<K,V> | containsKey | Object |
| AbstractMap<K,V> | containsValue | Object |
| AbstractMap<K,V> | equals | Object |
| AbstractMap<K,V> | get | Object |
| AbstractMap<K,V> | put | K |
| AbstractMap<K,V> | put | V |
| AbstractMap<K,V> | putAll | Map<? extends K,? extends V> |
| AbstractMap<K,V> | remove | Object |
| AbstractMap<String,String> | containsEntry | Entry<?,?> |
| AbstractMap<String,String> | containsKey | Object |
| AbstractMap<String,String> | containsValue | Object |
| AbstractMap<String,String> | equals | Object |
| AbstractMap<String,String> | get | Object |
| AbstractMap<String,String> | put | String |
| AbstractMap<String,String> | putAll | Map<? extends String,? extends String> |
| AbstractMap<String,String> | remove | Object |
| AbstractMutableCollection | add | E |
| AbstractMutableList | add | E |
| AbstractMutableList | add | int |
| AbstractMutableList | removeAt | int |
| AbstractMutableList | set | E |
| AbstractMutableList | set | int |
| AbstractMutableMap | put | K |
| AbstractMutableMap | put | V |
| Collection | add | E |
| Collection | addAll | Collection<? extends E> |
| Collection | contains | Object |
| Collection | containsAll | Collection<?> |
| Collection | equals | Object |
| Collection | remove | Object |
| Collection | removeAll | Collection<?> |
| Collection | removeIf | Predicate<? super E> |
| Collection | retainAll | Collection<?> |
| Collection | toArray | IntFunction<T[]> |
| Collection | toArray | T[] |
| Collection<E> | add | E |
| Collection<E> | addAll | Collection<? extends E> |
| Collection<E> | contains | Object |
| Collection<E> | containsAll | Collection<?> |
| Collection<E> | remove | Object |
| Collection<E> | removeAll | Collection<?> |
| Collection<E> | removeIf | Predicate<? super E> |
| Collection<E> | retainAll | Collection<?> |
| Collection<E> | toArray | IntFunction<T[]> |
| Collection<E> | toArray | T[] |
| Collection<Entry<K,V>> | add | Entry<K,V> |
| Collection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
| Collection<Entry<K,V>> | contains | Object |
| Collection<Entry<K,V>> | containsAll | Collection<?> |
| Collection<Entry<K,V>> | remove | Object |
| Collection<Entry<K,V>> | removeAll | Collection<?> |
| Collection<Entry<K,V>> | removeIf | Predicate<? super Entry<K,V>> |
| Collection<Entry<K,V>> | retainAll | Collection<?> |
| Collection<Entry<K,V>> | toArray | IntFunction<T[]> |
| Collection<Entry<K,V>> | toArray | T[] |
| Collection<K> | add | K |
| Collection<K> | addAll | Collection<? extends K> |
| Collection<K> | contains | Object |
| Collection<K> | containsAll | Collection<?> |
| Collection<K> | remove | Object |
| Collection<K> | removeAll | Collection<?> |
| Collection<K> | removeIf | Predicate<? super K> |
| Collection<K> | retainAll | Collection<?> |
| Collection<K> | toArray | IntFunction<T[]> |
| Collection<K> | toArray | T[] |
| Collection<String> | add | String |
| Collection<String> | addAll | Collection<? extends String> |
| Collection<String> | contains | Object |
| Collection<String> | containsAll | Collection<?> |
| Collection<String> | equals | Object |
| Collection<String> | remove | Object |
| Collection<String> | removeAll | Collection<?> |
| Collection<String> | removeIf | Predicate<? super String> |
| Collection<String> | retainAll | Collection<?> |
| Collection<String> | toArray | IntFunction<T[]> |
| Collection<String> | toArray | T[] |
| Collection<V> | add | V |
| Collection<V> | addAll | Collection<? extends V> |
| Collection<V> | contains | Object |
| Collection<V> | containsAll | Collection<?> |
| Collection<V> | remove | Object |
| Collection<V> | removeAll | Collection<?> |
| Collection<V> | removeIf | Predicate<? super V> |
| Collection<V> | retainAll | Collection<?> |
| Collection<V> | toArray | IntFunction<T[]> |
| Collection<V> | toArray | T[] |
| List | add | E |
| List | add | int |
| List | addAll | Collection<? extends E> |
| List | addAll | int |
| List | contains | Object |
| List | containsAll | Collection<?> |
| List | copyOf | Collection<? extends E> |
| List | equals | Object |
| List | get | int |
| List | indexOf | Object |
| List | lastIndexOf | Object |
| List | listIterator | int |
| List | of | E |
| List | of | E[] |
| List | remove | Object |
| List | remove | int |
| List | removeAll | Collection<?> |
| List | replaceAll | UnaryOperator<E> |
| List | retainAll | Collection<?> |
| List | set | E |
| List | set | int |
| List | sort | Comparator<? super E> |
| List | subList | int |
| List | toArray | T[] |
| List<E> | add | E |
| List<E> | add | int |
| List<E> | addAll | Collection<? extends E> |
| List<E> | addAll | int |
| List<E> | contains | Object |
| List<E> | containsAll | Collection<?> |
| List<E> | copyOf | Collection<? extends E> |
| List<E> | get | int |
| List<E> | indexOf | Object |
| List<E> | lastIndexOf | Object |
| List<E> | listIterator | int |
| List<E> | of | E |
| List<E> | of | E[] |
| List<E> | remove | Object |
| List<E> | remove | int |
| List<E> | removeAll | Collection<?> |
| List<E> | replaceAll | UnaryOperator<E> |
| List<E> | retainAll | Collection<?> |
| List<E> | set | E |
| List<E> | set | int |
| List<E> | sort | Comparator<? super E> |
| List<E> | subList | int |
| List<E> | toArray | T[] |
| List<String> | add | String |
| List<String> | add | int |
| List<String> | addAll | Collection<? extends String> |
| List<String> | addAll | int |
| List<String> | contains | Object |
| List<String> | containsAll | Collection<?> |
| List<String> | copyOf | Collection<? extends E> |
| List<String> | equals | Object |
| List<String> | get | int |
| List<String> | indexOf | Object |
| List<String> | lastIndexOf | Object |
| List<String> | listIterator | int |
| List<String> | of | E |
| List<String> | of | E[] |
| List<String> | remove | Object |
| List<String> | remove | int |
| List<String> | removeAll | Collection<?> |
| List<String> | replaceAll | UnaryOperator<String> |
| List<String> | retainAll | Collection<?> |
| List<String> | set | String |
| List<String> | set | int |
| List<String> | sort | Comparator<? super String> |
| List<String> | subList | int |
| List<String> | toArray | T[] |
| Map | compute | BiFunction<? super K,? super V,? extends V> |
| Map | compute | K |
| Map | computeIfAbsent | Function<? super K,? extends V> |
| Map | computeIfAbsent | K |
| Map | computeIfPresent | BiFunction<? super K,? super V,? extends V> |
| Map | computeIfPresent | K |
| Map | containsKey | Object |
| Map | containsValue | Object |
| Map | copyOf | Map<? extends K,? extends V> |
| Map | entry | K |
| Map | entry | V |
| Map | equals | Object |
| Map | forEach | BiConsumer<? super K,? super V> |
| Map | get | Object |
| Map | getOrDefault | Object |
| Map | getOrDefault | V |
| Map | merge | BiFunction<? super V,? super V,? extends V> |
| Map | merge | K |
| Map | merge | V |
| Map | of | K |
| Map | of | V |
| Map | ofEntries | Entry<? extends K,? extends V>[] |
| Map | put | K |
| Map | put | V |
| Map | putAll | Map<? extends K,? extends V> |
| Map | putIfAbsent | K |
| Map | putIfAbsent | V |
| Map | remove | Object |
| Map | replace | K |
| Map | replace | V |
| Map | replaceAll | BiFunction<? super K,? super V,? extends V> |
| Map<Identity,Entry<?>> | compute | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
| Map<Identity,Entry<?>> | compute | Identity |
| Map<Identity,Entry<?>> | computeIfAbsent | Function<? super Identity,? extends Entry<?>> |
| Map<Identity,Entry<?>> | computeIfAbsent | Identity |
| Map<Identity,Entry<?>> | computeIfPresent | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
| Map<Identity,Entry<?>> | computeIfPresent | Identity |
| Map<Identity,Entry<?>> | containsKey | Object |
| Map<Identity,Entry<?>> | containsValue | Object |
| Map<Identity,Entry<?>> | copyOf | Map<? extends K,? extends V> |
| Map<Identity,Entry<?>> | entry | K |
| Map<Identity,Entry<?>> | entry | V |
| Map<Identity,Entry<?>> | forEach | BiConsumer<? super Identity,? super Entry<?>> |
| Map<Identity,Entry<?>> | get | Object |
| Map<Identity,Entry<?>> | getOrDefault | Entry<?> |
| Map<Identity,Entry<?>> | getOrDefault | Object |
| Map<Identity,Entry<?>> | merge | BiFunction<? super Entry<?>,? super Entry<?>,? extends Entry<?>> |
| Map<Identity,Entry<?>> | merge | Entry<?> |
| Map<Identity,Entry<?>> | merge | Identity |
| Map<Identity,Entry<?>> | of | K |
| Map<Identity,Entry<?>> | of | V |
| Map<Identity,Entry<?>> | ofEntries | Entry<? extends K,? extends V>[] |
| Map<Identity,Entry<?>> | put | Entry<?> |
| Map<Identity,Entry<?>> | put | Identity |
| Map<Identity,Entry<?>> | putAll | Map<? extends Identity,? extends Entry<?>> |
| Map<Identity,Entry<?>> | putIfAbsent | Entry<?> |
| Map<Identity,Entry<?>> | putIfAbsent | Identity |
| Map<Identity,Entry<?>> | remove | Object |
| Map<Identity,Entry<?>> | replace | Entry<?> |
| Map<Identity,Entry<?>> | replace | Identity |
| Map<Identity,Entry<?>> | replaceAll | BiFunction<? super Identity,? super Entry<?>,? extends Entry<?>> |
| Map<K,V> | compute | BiFunction<? super K,? super V,? extends V> |
| Map<K,V> | compute | K |
| Map<K,V> | computeIfAbsent | Function<? super K,? extends V> |
| Map<K,V> | computeIfAbsent | K |
| Map<K,V> | computeIfPresent | BiFunction<? super K,? super V,? extends V> |
| Map<K,V> | computeIfPresent | K |
| Map<K,V> | containsKey | Object |
| Map<K,V> | containsValue | Object |
| Map<K,V> | copyOf | Map<? extends K,? extends V> |
| Map<K,V> | entry | K |
| Map<K,V> | entry | V |
| Map<K,V> | forEach | BiConsumer<? super K,? super V> |
| Map<K,V> | get | Object |
| Map<K,V> | getOrDefault | Object |
| Map<K,V> | getOrDefault | V |
| Map<K,V> | merge | BiFunction<? super V,? super V,? extends V> |
| Map<K,V> | merge | K |
| Map<K,V> | merge | V |
| Map<K,V> | of | K |
| Map<K,V> | of | V |
| Map<K,V> | ofEntries | Entry<? extends K,? extends V>[] |
| Map<K,V> | put | K |
| Map<K,V> | put | V |
| Map<K,V> | putAll | Map<? extends K,? extends V> |
| Map<K,V> | putIfAbsent | K |
| Map<K,V> | putIfAbsent | V |
| Map<K,V> | remove | Object |
| Map<K,V> | replace | K |
| Map<K,V> | replace | V |
| Map<K,V> | replaceAll | BiFunction<? super K,? super V,? extends V> |
| Map<Object,Object> | compute | BiFunction<? super Object,? super Object,? extends Object> |
| Map<Object,Object> | compute | Object |
| Map<Object,Object> | computeIfAbsent | Function<? super Object,? extends Object> |
| Map<Object,Object> | computeIfAbsent | Object |
| Map<Object,Object> | computeIfPresent | BiFunction<? super Object,? super Object,? extends Object> |
| Map<Object,Object> | computeIfPresent | Object |
| Map<Object,Object> | containsKey | Object |
| Map<Object,Object> | containsValue | Object |
| Map<Object,Object> | copyOf | Map<? extends K,? extends V> |
| Map<Object,Object> | entry | K |
| Map<Object,Object> | entry | V |
| Map<Object,Object> | forEach | BiConsumer<? super Object,? super Object> |
| Map<Object,Object> | get | Object |
| Map<Object,Object> | getOrDefault | Object |
| Map<Object,Object> | merge | BiFunction<? super Object,? super Object,? extends Object> |
| Map<Object,Object> | merge | Object |
| Map<Object,Object> | of | K |
| Map<Object,Object> | of | V |
| Map<Object,Object> | ofEntries | Entry<? extends K,? extends V>[] |
| Map<Object,Object> | put | Object |
| Map<Object,Object> | putAll | Map<? extends Object,? extends Object> |
| Map<Object,Object> | putIfAbsent | Object |
| Map<Object,Object> | remove | Object |
| Map<Object,Object> | replace | Object |
| Map<Object,Object> | replaceAll | BiFunction<? super Object,? super Object,? extends Object> |
| Map<String,String> | compute | BiFunction<? super String,? super String,? extends String> |
| Map<String,String> | compute | String |
| Map<String,String> | computeIfAbsent | Function<? super String,? extends String> |
| Map<String,String> | computeIfAbsent | String |
| Map<String,String> | computeIfPresent | BiFunction<? super String,? super String,? extends String> |
| Map<String,String> | computeIfPresent | String |
| Map<String,String> | containsKey | Object |
| Map<String,String> | containsValue | Object |
| Map<String,String> | copyOf | Map<? extends K,? extends V> |
| Map<String,String> | entry | K |
| Map<String,String> | entry | V |
| Map<String,String> | equals | Object |
| Map<String,String> | forEach | BiConsumer<? super String,? super String> |
| Map<String,String> | get | Object |
| Map<String,String> | getOrDefault | Object |
| Map<String,String> | getOrDefault | String |
| Map<String,String> | merge | BiFunction<? super String,? super String,? extends String> |
| Map<String,String> | merge | String |
| Map<String,String> | of | K |
| Map<String,String> | of | V |
| Map<String,String> | ofEntries | Entry<? extends K,? extends V>[] |
| Map<String,String> | put | String |
| Map<String,String> | putAll | Map<? extends String,? extends String> |
| Map<String,String> | putIfAbsent | String |
| Map<String,String> | remove | Object |
| Map<String,String> | replace | String |
| Map<String,String> | replaceAll | BiFunction<? super String,? super String,? extends String> |
| MutableCollection | add | E |
| MutableCollection | addAll | Collection |
| MutableCollection | remove | Object |
| MutableCollection | removeAll | Collection<?> |
| MutableCollection | removeIf | Predicate<? super E> |
| MutableCollection | retainAll | Collection<?> |
| MutableList | add | E |
| MutableList | add | int |
| MutableList | addAll | Collection<? extends E> |
| MutableList | addAll | Collection<E> |
| MutableList | addAll | int |
| MutableList | listIterator | int |
| MutableList | remove | Object |
| MutableList | removeAll | Collection<?> |
| MutableList | removeAt | int |
| MutableList | replaceAll | UnaryOperator<E> |
| MutableList | retainAll | Collection<?> |
| MutableList | set | E |
| MutableList | set | int |
| MutableList | sort | Comparator<? super E> |
| MutableList | subList | int |
| MutableMap | compute | BiFunction<? super K,? super V,? extends V> |
| MutableMap | compute | K |
| MutableMap | computeIfAbsent | Function<? super K,? extends V> |
| MutableMap | computeIfAbsent | K |
| MutableMap | computeIfPresent | BiFunction<? super K,? super V,? extends V> |
| MutableMap | computeIfPresent | K |
| MutableMap | merge | BiFunction<? super V,? super V,? extends V> |
| MutableMap | merge | K |
| MutableMap | merge | V |
| MutableMap | put | K |
| MutableMap | put | V |
| MutableMap | putAll | Map<? extends K,V> |
| MutableMap | putIfAbsent | K |
| MutableMap | putIfAbsent | V |
| MutableMap | remove | Object |
| MutableMap | replace | K |
| MutableMap | replace | V |
| MutableMap | replaceAll | BiFunction<? super K,? super V,? extends V> |

29
java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.kt Normal file
View File

@@ -0,0 +1,29 @@
fun test(
p1: Map<String, String>,
p2: AbstractMap<String, String>,
p3: Collection<String>,
p4: AbstractCollection<String>,
p5: List<String>,
p6: AbstractList<String>,
p7: MutableMap<String, String>,
p8: AbstractMutableMap<String, String>,
p9: MutableCollection<String>,
p10: AbstractMutableCollection<String>,
p11: MutableList<String>,
p12: AbstractMutableList<String>) {
// Use a method of each to ensure method prototypes are extracted:
p1.get("Hello");
p2.get("Hello");
p3.contains("Hello");
p4.contains("Hello");
p5.contains("Hello");
p6.contains("Hello");
p7.remove("Hello");
p8.remove("Hello");
p9.remove("Hello");
p10.remove("Hello");
p11.remove("Hello");
p12.remove("Hello");
}

28
java/ql/test/kotlin/library-tests/java-kotlin-collection-type-generic-methods/test.ql Normal file
View File

@@ -0,0 +1,28 @@
import java
RefType getARelevantCollectionType() {
result
.hasQualifiedName(["java.util", "kotlin.collections"],
["Abstract", ""] + ["Mutable", ""] + ["Collection", "List", "Map"])
}
class RelevantMethod extends Method {
RelevantMethod() { this.getDeclaringType().getSourceDeclaration() = getARelevantCollectionType() }
}
// Check for methods with suspicious twins -- probably another extraction of the same method outline which was given a different trap key.
// It so happens the collections methods of interest to this test don't use overloads with the same parameter count.
query predicate methodWithDuplicate(string methodName, string typeName) {
exists(RelevantMethod m, RelevantMethod dup |
dup.getName() = m.getName() and
not dup.getName() = ["of", "remove", "toArray"] and // These really do have overloads with the same parameter count, so it isn't trivial to tell if they are intentional overloads or inappropriate duplicates.
dup.getNumberOfParameters() = m.getNumberOfParameters() and
dup.getDeclaringType() = m.getDeclaringType() and
dup != m and
methodName = m.getName() and
typeName = m.getDeclaringType().getName()
)
}
from RelevantMethod m
select m.getDeclaringType().getName(), m.getName(), m.getAParamType().getName()