Skip to content

Commit 377403d

Browse files
committed
Remove redundant models and corresponding test
Iterator.next is already modelled
1 parent 5d3f108 commit 377403d

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

java/ql/src/semmle/code/java/frameworks/apache/Collections.qll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
8888
// In order for the models of Iterator to work we have to use Element instead of MapKey for key data.
8989
"org.apache.commons.collections4;MapIterator;true;getKey;;;Element of Argument[-1];ReturnValue;value",
9090
"org.apache.commons.collections4;MapIterator;true;getValue;;;MapValue of Argument[-1];ReturnValue;value",
91-
"org.apache.commons.collections4;MapIterator;true;next;;;Element of Argument[-1];ReturnValue;value",
9291
"org.apache.commons.collections4;MapIterator;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",
9392
"org.apache.commons.collections4;MapIterator;true;setValue;;;Argument[0];MapValue of Argument[-1];value",
9493
"org.apache.commons.collections4;MultiMap;true;get;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
@@ -177,7 +176,6 @@ private class ApacheCollectionsModel extends SummaryModelCsv {
177176
"org.apache.commons.collections;KeyValue;true;getValue;;;MapValue of Argument[-1];ReturnValue;value",
178177
"org.apache.commons.collections;MapIterator;true;getKey;;;Element of Argument[-1];ReturnValue;value",
179178
"org.apache.commons.collections;MapIterator;true;getValue;;;MapValue of Argument[-1];ReturnValue;value",
180-
"org.apache.commons.collections;MapIterator;true;next;;;Element of Argument[-1];ReturnValue;value",
181179
"org.apache.commons.collections;MapIterator;true;setValue;;;MapValue of Argument[-1];ReturnValue;value",
182180
"org.apache.commons.collections;MapIterator;true;setValue;;;Argument[0];MapValue of Argument[-1];value",
183181
"org.apache.commons.collections;MultiMap;true;get;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",

java/ql/test/library-tests/frameworks/apache-collections/Test.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2675,13 +2675,6 @@ public void test() {
26752675
out = in.getValue();
26762676
sink(out); // $ hasValueFlow
26772677
}
2678-
{
2679-
// "org.apache.commons.collections4;MapIterator;true;next;;;Element of Argument[-1];ReturnValue;value"
2680-
Object out = null;
2681-
MapIterator in = newOMIWithElement((String)source());
2682-
out = in.next();
2683-
sink(out); // $ hasValueFlow
2684-
}
26852678
{
26862679
// "org.apache.commons.collections4;MapIterator;true;setValue;;;Argument[0];MapValue of Argument[-1];value"
26872680
MapIterator out = null;

0 commit comments

Comments
 (0)