Skip to content

Commit 12b9209

Browse files
authored
Annotate some SequencedCollection-related APIs. (#77)
1 parent 2b3db41 commit 12b9209

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

src/java.base/share/classes/java/util/Collections.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ public Stream<E> parallelStream() {
11731173
* @since 21
11741174
*/
11751175
@SuppressWarnings("unchecked")
1176-
public static <T> SequencedCollection<T> unmodifiableSequencedCollection(SequencedCollection<? extends T> c) {
1176+
public static <T extends @Nullable Object> SequencedCollection<T> unmodifiableSequencedCollection(SequencedCollection<? extends T> c) {
11771177
if (c.getClass() == UnmodifiableSequencedCollection.class) {
11781178
return (SequencedCollection<T>) c;
11791179
}
@@ -1283,7 +1283,7 @@ static class UnmodifiableSet<E extends @Nullable Object> extends UnmodifiableCol
12831283
* @since 21
12841284
*/
12851285
@SuppressWarnings("unchecked")
1286-
public static <T> SequencedSet<T> unmodifiableSequencedSet(SequencedSet<? extends T> s) {
1286+
public static <T extends @Nullable Object> SequencedSet<T> unmodifiableSequencedSet(SequencedSet<? extends T> s) {
12871287
// Not checking for subclasses because of heap pollution and information leakage.
12881288
if (s.getClass() == UnmodifiableSequencedSet.class) {
12891289
return (SequencedSet<T>) s;
@@ -2004,7 +2004,7 @@ && eq(e.getKey(), t.getKey())
20042004
* @since 21
20052005
*/
20062006
@SuppressWarnings("unchecked")
2007-
public static <K,V> SequencedMap<K,V> unmodifiableSequencedMap(SequencedMap<? extends K, ? extends V> m) {
2007+
public static <K extends @Nullable Object,V extends @Nullable Object> SequencedMap<K,V> unmodifiableSequencedMap(SequencedMap<? extends K, ? extends V> m) {
20082008
// Not checking for subclasses because of heap pollution and information leakage.
20092009
if (m.getClass() == UnmodifiableSequencedMap.class) {
20102010
return (SequencedMap<K,V>) m;
@@ -6139,7 +6139,7 @@ private void readObjectNoData() throws java.io.ObjectStreamException {
61396139
* @throws IllegalArgumentException if {@code map} is not empty
61406140
* @since 21
61416141
*/
6142-
public static <E> SequencedSet<E> newSequencedSetFromMap(SequencedMap<E, Boolean> map) {
6142+
public static <E extends @Nullable Object> SequencedSet<E> newSequencedSetFromMap(SequencedMap<E, Boolean> map) {
61436143
if (! map.isEmpty()) // implicit null check
61446144
throw new IllegalArgumentException("Map is non-empty");
61456145
return new SequencedSetFromMap<>(map);

src/java.base/share/classes/java/util/LinkedHashMap.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ void afterNodeAccess(Node<K,V> e) {
393393
*
394394
* @since 21
395395
*/
396-
public V putFirst(K k, V v) {
396+
public @Nullable V putFirst(K k, V v) {
397397
try {
398398
putMode = PUT_FIRST;
399399
return this.put(k, v);
@@ -410,7 +410,7 @@ public V putFirst(K k, V v) {
410410
*
411411
* @since 21
412412
*/
413-
public V putLast(K k, V v) {
413+
public @Nullable V putLast(K k, V v) {
414414
try {
415415
putMode = PUT_LAST;
416416
return this.put(k, v);

src/java.base/share/classes/java/util/SortedMap.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ public interface SortedMap<K extends @Nullable Object,V extends @Nullable Object
305305
* @throws UnsupportedOperationException always
306306
* @since 21
307307
*/
308-
default V putFirst(K k, V v) {
308+
default @Nullable V putFirst(K k, V v) {
309309
throw new UnsupportedOperationException();
310310
}
311311

@@ -320,7 +320,7 @@ default V putFirst(K k, V v) {
320320
* @throws UnsupportedOperationException always
321321
* @since 21
322322
*/
323-
default V putLast(K k, V v) {
323+
default @Nullable V putLast(K k, V v) {
324324
throw new UnsupportedOperationException();
325325
}
326326

src/java.base/share/classes/java/util/TreeMap.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ public K lastKey() {
329329
* @throws UnsupportedOperationException always
330330
* @since 21
331331
*/
332-
public V putFirst(K k, V v) {
332+
public @Nullable V putFirst(K k, V v) {
333333
throw new UnsupportedOperationException();
334334
}
335335

@@ -341,7 +341,7 @@ public V putFirst(K k, V v) {
341341
* @throws UnsupportedOperationException always
342342
* @since 21
343343
*/
344-
public V putLast(K k, V v) {
344+
public @Nullable V putLast(K k, V v) {
345345
throw new UnsupportedOperationException();
346346
}
347347

src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1896,7 +1896,7 @@ public K lastKey() {
18961896
* @throws UnsupportedOperationException always
18971897
* @since 21
18981898
*/
1899-
public V putFirst(K k, V v) {
1899+
public @Nullable V putFirst(K k, V v) {
19001900
throw new UnsupportedOperationException();
19011901
}
19021902

@@ -1908,7 +1908,7 @@ public V putFirst(K k, V v) {
19081908
* @throws UnsupportedOperationException always
19091909
* @since 21
19101910
*/
1911-
public V putLast(K k, V v) {
1911+
public @Nullable V putLast(K k, V v) {
19121912
throw new UnsupportedOperationException();
19131913
}
19141914

0 commit comments

Comments
 (0)