Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3b678bf

Browse files
owen-mcowen-mc
committed
Address review comments
1 parent e1750ad commit 3b678bf

1 file changed

Lines changed: 19 additions & 16 deletions

File tree

‎java/ql/lib/semmle/code/java/frameworks/apache/Collections.qll‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private class ApacheBidiMapModel extends SummaryModelCsv {
248248
".bidimap;AbstractDualBidiMap$BidiMapIterator;true;BidiMapIterator;;;MapValue of Argument[0];MapValue of Argument[-1];value",
249249
".bidimap;AbstractDualBidiMap$EntrySet;true;EntrySet;;;MapKey of Argument[0];MapKey of Element of Argument[-1];value",
250250
".bidimap;AbstractDualBidiMap$EntrySet;true;EntrySet;;;MapValue of Argument[0];MapValue of Element of Argument[-1];value",
251-
".bidimap;AbstractDualBidiMap$EntrySetIterator;true;EntrySetIterator;;;Element of Argument[0];MapKey of Element of Argument[-1];value",
251+
".bidimap;AbstractDualBidiMap$EntrySetIterator;true;EntrySetIterator;;;MapKey of Element of Argument[0];MapKey of Element of Argument[-1];value",
252252
".bidimap;AbstractDualBidiMap$EntrySetIterator;true;EntrySetIterator;;;MapValue of Element of Argument[0];MapValue of Element of Argument[-1];value",
253253
".bidimap;AbstractDualBidiMap$EntrySetIterator;true;EntrySetIterator;;;MapKey of Argument[1];MapKey of Element of Argument[-1];value",
254254
".bidimap;AbstractDualBidiMap$EntrySetIterator;true;EntrySetIterator;;;MapValue of Argument[1];MapValue of Element of Argument[-1];value",
@@ -257,8 +257,11 @@ private class ApacheBidiMapModel extends SummaryModelCsv {
257257
".bidimap;AbstractDualBidiMap$KeySetIterator;true;KeySetIterator;;;MapKey of Argument[1];Element of Argument[-1];value",
258258
".bidimap;AbstractDualBidiMap$MapEntry;true;MapEntry;;;MapKey of Argument[0];MapKey of Argument[-1];value",
259259
".bidimap;AbstractDualBidiMap$MapEntry;true;MapEntry;;;MapValue of Argument[0];MapValue of Argument[-1];value",
260+
".bidimap;AbstractDualBidiMap$MapEntry;true;MapEntry;;;MapKey of Argument[1];MapKey of Argument[-1];value",
261+
".bidimap;AbstractDualBidiMap$MapEntry;true;MapEntry;;;MapValue of Argument[1];MapValue of Argument[-1];value",
260262
".bidimap;AbstractDualBidiMap$Values;true;Values;;;MapValue of Argument[0];Element of Argument[-1];value",
261263
".bidimap;AbstractDualBidiMap$ValuesIterator;true;ValuesIterator;;;Element of Argument[0];Element of Argument[-1];value",
264+
".bidimap;AbstractDualBidiMap$ValuesIterator;true;ValuesIterator;;;MapValue of Argument[1];Element of Argument[-1];value",
262265
".bidimap;AbstractDualBidiMap$View;true;View;;;Element of Argument[0];Element of Argument[-1];value",
263266
".bidimap;AbstractDualBidiMap;true;AbstractDualBidiMap;;;MapKey of Argument[0];MapKey of Argument[-1];value",
264267
".bidimap;AbstractDualBidiMap;true;AbstractDualBidiMap;;;MapValue of Argument[0];MapValue of Argument[-1];value",
@@ -284,8 +287,8 @@ private class ApacheBidiMapModel extends SummaryModelCsv {
284287
".bidimap;DualHashBidiMap;true;DualHashBidiMap;(Map);;MapValue of Argument[0];MapValue of Argument[-1];value",
285288
".bidimap;DualLinkedHashBidiMap;true;DualLinkedHashBidiMap;(Map);;MapKey of Argument[0];MapKey of Argument[-1];value",
286289
".bidimap;DualLinkedHashBidiMap;true;DualLinkedHashBidiMap;(Map);;MapValue of Argument[0];MapValue of Argument[-1];value",
287-
".bidimap;DualTreeBidiMap;true;DualTreeBidiMap;(Map);;MapKey of Argument[0];MapKey of Argument[-1];value",
288-
".bidimap;DualTreeBidiMap;true;DualTreeBidiMap;(Map);;MapValue of Argument[0];MapValue of Argument[-1];value",
290+
".bidimap;DualTreeBidiMap;true;DualTreeBidiMap;;;MapKey of Argument[0];MapKey of Argument[-1];value",
291+
".bidimap;DualTreeBidiMap;true;DualTreeBidiMap;;;MapValue of Argument[0];MapValue of Argument[-1];value",
289292
".bidimap;DualTreeBidiMap;true;inverseOrderedBidiMap;;;MapKey of Argument[-1];MapValue of ReturnValue;value",
290293
".bidimap;DualTreeBidiMap;true;inverseOrderedBidiMap;;;MapValue of Argument[-1];MapKey of ReturnValue;value",
291294
".bidimap;DualTreeBidiMap;true;inverseSortedBidiMap;;;MapKey of Argument[-1];MapValue of ReturnValue;value",
@@ -421,6 +424,7 @@ private class ApacheIteratorsModel extends SummaryModelCsv {
421424
".iterators;ObjectArrayIterator;true;getArray;;;Element of Argument[-1];ArrayElement of ReturnValue;value",
422425
".iterators;ObjectArrayListIterator;true;ObjectArrayListIterator;;;ArrayElement of Argument[0];Element of Argument[-1];value",
423426
".iterators;ObjectGraphIterator;true;ObjectGraphIterator;(Iterator);;Element of Element of Argument[0];Element of Argument[-1];value",
427+
".iterators;PeekingIterator;true;PeekingIterator;;;Element of Argument[0];Element of Argument[-1];value",
424428
".iterators;PeekingIterator;true;peekingIterator;;;Element of Argument[0];Element of ReturnValue;value",
425429
".iterators;PeekingIterator;true;peek;;;Element of Argument[-1];ReturnValue;value",
426430
".iterators;PeekingIterator;true;element;;;Element of Argument[-1];ReturnValue;value",
@@ -529,7 +533,7 @@ private class ApacheMapModel extends SummaryModelCsv {
529533
// Note that when lambdas are supported we should have more models for DefaultedMap, LazyMap, TransformedMap, TransformedSortedMap
530534
".map;AbstractHashedMap;true;AbstractHashedMap;(Map);;MapKey of Argument[0];MapKey of Argument[-1];value",
531535
".map;AbstractHashedMap;true;AbstractHashedMap;(Map);;MapValue of Argument[0];MapValue of Argument[-1];value",
532-
".map;AbstractHashedMap;true;convertKey;;;Argument[0];ReturnValue;value",
536+
".map;AbstractHashedMap;false;convertKey;;;Argument[0];ReturnValue;value",
533537
".map;AbstractHashedMap;true;entryKey;;;MapKey of Argument[-1];ReturnValue;value",
534538
".map;AbstractHashedMap;true;entryKey;;;MapKey of Argument[0];ReturnValue;value",
535539
".map;AbstractHashedMap;true;entryValue;;;MapValue of Argument[-1];ReturnValue;value",
@@ -544,8 +548,8 @@ private class ApacheMapModel extends SummaryModelCsv {
544548
".map;AbstractLinkedMap;true;AbstractLinkedMap;(Map);;MapValue of Argument[0];MapValue of Argument[-1];value",
545549
".map;AbstractMapDecorator;true;AbstractMapDecorator;(Map);;MapKey of Argument[0];MapKey of Argument[-1];value",
546550
".map;AbstractMapDecorator;true;AbstractMapDecorator;(Map);;MapValue of Argument[0];MapValue of Argument[-1];value",
547-
".map;AbstractMapDecorator;true;decorated;;;MapKey of Argument[-1];MapKey of Argument[0];value",
548-
".map;AbstractMapDecorator;true;decorated;;;MapValue of Argument[-1];MapValue of Argument[0];value",
551+
".map;AbstractMapDecorator;true;decorated;;;MapKey of Argument[-1];MapKey of ReturnValue;value",
552+
".map;AbstractMapDecorator;true;decorated;;;MapValue of Argument[-1];MapValue of ReturnValue;value",
549553
".map;AbstractOrderedMapDecorator;true;AbstractOrderedMapDecorator;(OrderedMap);;MapKey of Argument[0];MapKey of Argument[-1];value",
550554
".map;AbstractOrderedMapDecorator;true;AbstractOrderedMapDecorator;(OrderedMap);;MapValue of Argument[0];MapValue of Argument[-1];value",
551555
".map;AbstractSortedMapDecorator;true;AbstractSortedMapDecorator;(SortedMap);;MapKey of Argument[0];MapKey of Argument[-1];value",
@@ -629,17 +633,17 @@ private class ApacheMapModel extends SummaryModelCsv {
629633
".map;MultiValueMap;true;multiValueMap;;;MapKey of Argument[0];MapKey of ReturnValue;value",
630634
".map;MultiValueMap;true;multiValueMap;;;Element of MapValue of Argument[0];Element of MapValue of ReturnValue;value",
631635
".map;MultiValueMap;true;getCollection;;;Element of MapValue of Argument[-1];Element of ReturnValue;value",
632-
".map;MultiValueMap;true;putAll;;;Argument[0];MapKey of Argument[-1];value",
633-
".map;MultiValueMap;true;putAll;;;Element of Argument[1];Element of MapValue of Argument[-1];value",
636+
".map;MultiValueMap;true;putAll;(Object,Collection);;Argument[0];MapKey of Argument[-1];value",
637+
".map;MultiValueMap;true;putAll;(Object,Collection);;Element of Argument[1];Element of MapValue of Argument[-1];value",
634638
".map;MultiValueMap;true;iterator;(Object);;Element of MapValue of Argument[-1];Element of ReturnValue;value",
635639
".map;MultiValueMap;true;iterator;();;MapKey of Argument[-1];MapKey of Element of ReturnValue;value",
636640
".map;MultiValueMap;true;iterator;();;Element of MapValue of Argument[-1];MapValue of Element of ReturnValue;value",
637641
".map;PassiveExpiringMap;true;PassiveExpiringMap;(ExpirationPolicy,Map);;MapKey of Argument[1];MapKey of Argument[-1];value",
638642
".map;PassiveExpiringMap;true;PassiveExpiringMap;(ExpirationPolicy,Map);;MapValue of Argument[1];MapValue of Argument[-1];value",
639643
".map;PassiveExpiringMap;true;PassiveExpiringMap;(long,Map);;MapKey of Argument[1];MapKey of Argument[-1];value",
640644
".map;PassiveExpiringMap;true;PassiveExpiringMap;(long,Map);;MapValue of Argument[1];MapValue of Argument[-1];value",
641-
".map;PassiveExpiringMap;true;PassiveExpiringMap;(long,TimeUnit,Map);;MapKey of Argument[1];MapKey of Argument[-1];value",
642-
".map;PassiveExpiringMap;true;PassiveExpiringMap;(long,TimeUnit,Map);;MapValue of Argument[1];MapValue of Argument[-1];value",
645+
".map;PassiveExpiringMap;true;PassiveExpiringMap;(long,TimeUnit,Map);;MapKey of Argument[2];MapKey of Argument[-1];value",
646+
".map;PassiveExpiringMap;true;PassiveExpiringMap;(long,TimeUnit,Map);;MapValue of Argument[2];MapValue of Argument[-1];value",
643647
".map;PassiveExpiringMap;true;PassiveExpiringMap;(Map);;MapKey of Argument[0];MapKey of Argument[-1];value",
644648
".map;PassiveExpiringMap;true;PassiveExpiringMap;(Map);;MapValue of Argument[0];MapValue of Argument[-1];value",
645649
".map;PredicatedMap;true;predicatedMap;;;MapKey of Argument[0];MapKey of ReturnValue;value",
@@ -768,19 +772,18 @@ private class ApacheSetModel extends SummaryModelCsv {
768772
".set;CompositeSet$SetMutator;true;addAll;;;Element of Argument[2];Element of Argument[0];value",
769773
".set;CompositeSet$SetMutator;true;addAll;;;Element of Argument[2];Element of Element of Argument[1];value",
770774
".set;CompositeSet;true;CompositeSet;(Set);;Element of Argument[0];Element of Argument[-1];value",
771-
".set;CompositeSet;true;CompositeSet;(Set[]);;Element of Element of Argument[0];Element of Argument[-1];value",
772-
".set;CompositeSet;true;addComposited;(Set);;Element of Argument[0];Element of Argument[-1];value",
773-
".set;CompositeSet;true;addComposited;(Set,Set);;Element of Argument[0];Element of Argument[-1];value",
774-
".set;CompositeSet;true;addComposited;(Set,Set);;Element of Argument[1];Element of Argument[-1];value",
775-
".set;CompositeSet;true;addComposited;(Set[]);;Element of Element of Argument[0];Element of Argument[-1];value",
775+
".set;CompositeSet;true;CompositeSet;(Set[]);;Element of ArrayElement of Argument[0];Element of Argument[-1];value",
776+
".set;CompositeSet;true;addComposited;;;Element of Argument[0];Element of Argument[-1];value",
777+
".set;CompositeSet;true;addComposited;;;Element of Argument[1];Element of Argument[-1];value",
778+
".set;CompositeSet;true;addComposited;(Set[]);;Element of ArrayElement of Argument[0];Element of Argument[-1];value",
776779
".set;CompositeSet;true;toSet;;;Element of Argument[-1];Element of ReturnValue;value",
777780
".set;CompositeSet;true;getSets;;;Element of Argument[-1];Element of Element of ReturnValue;value",
778781
".set;ListOrderedSet;true;listOrderedSet;(Set);;Element of Argument[0];Element of ReturnValue;value",
779782
".set;ListOrderedSet;true;listOrderedSet;(List);;Element of Argument[0];Element of ReturnValue;value",
780783
".set;ListOrderedSet;true;asList;;;Element of Argument[-1];Element of ReturnValue;value",
781784
".set;ListOrderedSet;true;get;;;Element of Argument[-1];ReturnValue;value",
782785
".set;ListOrderedSet;true;add;;;Argument[1];Element of Argument[-1];value",
783-
".set;ListOrderedSet;true;add;;;Element of Argument[1];Element of Argument[-1];value",
786+
".set;ListOrderedSet;true;addAll;;;Element of Argument[1];Element of Argument[-1];value",
784787
".set;MapBackedSet;true;mapBackedSet;;;MapKey of Argument[0];Element of ReturnValue;value",
785788
".set;PredicatedNavigableSet;true;predicatedNavigableSet;;;Element of Argument[0];Element of ReturnValue;value",
786789
".set;PredicatedSet;true;predicatedSet;;;Element of Argument[0];Element of ReturnValue;value",

0 commit comments

Comments
 (0)