Skip to content

Write extends @NonNull Object instead of extends Object. #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cpovirk wants to merge 1 commit into from
Closed

Write extends @NonNull Object instead of extends Object. #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/java.base/share/classes/java/util/List.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.checkerframework.checker.index.qual.NonNegative;
import org.checkerframework.checker.lock.qual.GuardSatisfied;
import org.checkerframework.checker.lock.qual.ReleasesNoLocks;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.dataflow.qual.Pure;
Expand Down Expand Up @@ -835,7 +836,7 @@ static <E> List<E> of() {
*
* @since 9
*/
static <E extends Object> List<E> of(E e1) {
static <E extends @NonNull Object> List<E> of(E e1) {
return new ImmutableCollections.List12<>(e1);
}

Expand All @@ -852,7 +853,7 @@ static <E extends Object> List<E> of(E e1) {
*
* @since 9
*/
static <E extends Object> List<E> of(E e1, E e2) {
static <E extends @NonNull Object> List<E> of(E e1, E e2) {
return new ImmutableCollections.List12<>(e1, e2);
}

Expand All @@ -870,7 +871,7 @@ static <E extends Object> List<E> of(E e1, E e2) {
*
* @since 9
*/
static <E extends Object> List<E> of(E e1, E e2, E e3) {
static <E extends @NonNull Object> List<E> of(E e1, E e2, E e3) {
return new ImmutableCollections.ListN<>(e1, e2, e3);
}

Expand All @@ -889,7 +890,7 @@ static <E extends Object> List<E> of(E e1, E e2, E e3) {
*
* @since 9
*/
static <E extends Object> List<E> of(E e1, E e2, E e3, E e4) {
static <E extends @NonNull Object> List<E> of(E e1, E e2, E e3, E e4) {
return new ImmutableCollections.ListN<>(e1, e2, e3, e4);
}

Expand All @@ -909,7 +910,7 @@ static <E extends Object> List<E> of(E e1, E e2, E e3, E e4) {
*
* @since 9
*/
static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5) {
static <E extends @NonNull Object> List<E> of(E e1, E e2, E e3, E e4, E e5) {
return new ImmutableCollections.ListN<>(e1, e2, e3, e4, e5);
}

Expand All @@ -930,7 +931,7 @@ static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5) {
*
* @since 9
*/
static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6) {
static <E extends @NonNull Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6) {
return new ImmutableCollections.ListN<>(e1, e2, e3, e4, e5,
e6);
}
Expand All @@ -953,7 +954,7 @@ static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6) {
*
* @since 9
*/
static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7) {
static <E extends @NonNull Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7) {
return new ImmutableCollections.ListN<>(e1, e2, e3, e4, e5,
e6, e7);
}
Expand All @@ -977,7 +978,7 @@ static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7) {
*
* @since 9
*/
static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8) {
static <E extends @NonNull Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8) {
return new ImmutableCollections.ListN<>(e1, e2, e3, e4, e5,
e6, e7, e8);
}
Expand All @@ -1002,7 +1003,7 @@ static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E
*
* @since 9
*/
static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9) {
static <E extends @NonNull Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9) {
return new ImmutableCollections.ListN<>(e1, e2, e3, e4, e5,
e6, e7, e8, e9);
}
Expand All @@ -1028,7 +1029,7 @@ static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E
*
* @since 9
*/
static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9, E e10) {
static <E extends @NonNull Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9, E e10) {
return new ImmutableCollections.ListN<>(e1, e2, e3, e4, e5,
e6, e7, e8, e9, e10);
}
Expand Down Expand Up @@ -1060,7 +1061,7 @@ static <E extends Object> List<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E
*/
@SafeVarargs
@SuppressWarnings("varargs")
static <E extends Object> List<E> of(E... elements) {
static <E extends @NonNull Object> List<E> of(E... elements) {
switch (elements.length) { // implicit null check of elements
case 0:
return ImmutableCollections.emptyList();
Expand Down Expand Up @@ -1089,7 +1090,7 @@ static <E extends Object> List<E> of(E... elements) {
* @throws NullPointerException if coll is null, or if it contains any nulls
* @since 10
*/
static <E extends Object> List<E> copyOf(Collection<? extends E> coll) {
static <E extends @NonNull Object> List<E> copyOf(Collection<? extends E> coll) {
return ImmutableCollections.listCopy(coll);
}
}
26 changes: 13 additions & 13 deletions src/java.base/share/classes/java/util/Map.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,7 @@ static <K, V> Map<K, V> of() {
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1) {
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1) {
return new ImmutableCollections.Map1<>(k1, v1);
}

Expand All @@ -1365,7 +1365,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1) {
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2) {
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1, K k2, V v2) {
return new ImmutableCollections.MapN<>(k1, v1, k2, v2);
}

Expand All @@ -1387,7 +1387,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2)
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3) {
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3) {
return new ImmutableCollections.MapN<>(k1, v1, k2, v2, k3, v3);
}

Expand All @@ -1411,7 +1411,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2,
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4) {
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4) {
return new ImmutableCollections.MapN<>(k1, v1, k2, v2, k3, v3, k4, v4);
}

Expand All @@ -1437,7 +1437,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2,
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5) {
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5) {
return new ImmutableCollections.MapN<>(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5);
}

Expand Down Expand Up @@ -1465,7 +1465,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2,
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
K k6, V v6) {
return new ImmutableCollections.MapN<>(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5,
k6, v6);
Expand Down Expand Up @@ -1497,7 +1497,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2,
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
K k6, V v6, K k7, V v7) {
return new ImmutableCollections.MapN<>(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5,
k6, v6, k7, v7);
Expand Down Expand Up @@ -1531,7 +1531,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2,
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
K k6, V v6, K k7, V v7, K k8, V v8) {
return new ImmutableCollections.MapN<>(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5,
k6, v6, k7, v7, k8, v8);
Expand Down Expand Up @@ -1567,7 +1567,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2,
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9) {
return new ImmutableCollections.MapN<>(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5,
k6, v6, k7, v7, k8, v8, k9, v9);
Expand Down Expand Up @@ -1605,7 +1605,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2,
*
* @since 9
*/
static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5,
K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9, K k10, V v10) {
return new ImmutableCollections.MapN<>(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5,
k6, v6, k7, v7, k8, v8, k9, v9, k10, v10);
Expand Down Expand Up @@ -1644,7 +1644,7 @@ static <K extends Object, V extends Object> Map<K, V> of(K k1, V v1, K k2, V v2,
*/
@SafeVarargs
@SuppressWarnings("varargs")
static <K extends Object, V extends Object> Map<K, V> ofEntries(Entry<? extends K, ? extends V>... entries) {
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> ofEntries(Entry<? extends K, ? extends V>... entries) {
if (entries.length == 0) { // implicit null check of entries array
return ImmutableCollections.emptyMap();
} else if (entries.length == 1) {
Expand Down Expand Up @@ -1696,7 +1696,7 @@ static <K extends Object, V extends Object> Map<K, V> ofEntries(Entry<? extends
* @see Map#ofEntries Map.ofEntries()
* @since 9
*/
static <K extends Object, V extends Object> Entry<K, V> entry(K k, V v) {
static <K extends @NonNull Object, V extends @NonNull Object> Entry<K, V> entry(K k, V v) {
// KeyValueHolder checks for nulls
return new KeyValueHolder<>(k, v);
}
Expand All @@ -1719,7 +1719,7 @@ static <K extends Object, V extends Object> Entry<K, V> entry(K k, V v) {
* @since 10
*/
@SuppressWarnings({"rawtypes","unchecked"})
static <K extends Object, V extends Object> Map<K, V> copyOf(Map<? extends K, ? extends V> map) {
static <K extends @NonNull Object, V extends @NonNull Object> Map<K, V> copyOf(Map<? extends K, ? extends V> map) {
if (map instanceof ImmutableCollections.AbstractImmutableMap) {
return (Map<K,V>)map;
} else {
Expand Down
25 changes: 13 additions & 12 deletions src/java.base/share/classes/java/util/Set.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import org.checkerframework.checker.index.qual.NonNegative;
import org.checkerframework.checker.lock.qual.GuardSatisfied;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.dataflow.qual.Pure;
Expand Down Expand Up @@ -483,7 +484,7 @@ static <E> Set<E> of() {
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1) {
static <E extends @NonNull Object> Set<E> of(E e1) {
return new ImmutableCollections.Set12<>(e1);
}

Expand All @@ -500,7 +501,7 @@ static <E extends Object> Set<E> of(E e1) {
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1, E e2) {
static <E extends @NonNull Object> Set<E> of(E e1, E e2) {
return new ImmutableCollections.Set12<>(e1, e2);
}

Expand All @@ -518,7 +519,7 @@ static <E extends Object> Set<E> of(E e1, E e2) {
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1, E e2, E e3) {
static <E extends @NonNull Object> Set<E> of(E e1, E e2, E e3) {
return new ImmutableCollections.SetN<>(e1, e2, e3);
}

Expand All @@ -537,7 +538,7 @@ static <E extends Object> Set<E> of(E e1, E e2, E e3) {
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4) {
static <E extends @NonNull Object> Set<E> of(E e1, E e2, E e3, E e4) {
return new ImmutableCollections.SetN<>(e1, e2, e3, e4);
}

Expand All @@ -557,7 +558,7 @@ static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4) {
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5) {
static <E extends @NonNull Object> Set<E> of(E e1, E e2, E e3, E e4, E e5) {
return new ImmutableCollections.SetN<>(e1, e2, e3, e4, e5);
}

Expand All @@ -578,7 +579,7 @@ static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5) {
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6) {
static <E extends @NonNull Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6) {
return new ImmutableCollections.SetN<>(e1, e2, e3, e4, e5,
e6);
}
Expand All @@ -601,7 +602,7 @@ static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6) {
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7) {
static <E extends @NonNull Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7) {
return new ImmutableCollections.SetN<>(e1, e2, e3, e4, e5,
e6, e7);
}
Expand All @@ -625,7 +626,7 @@ static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7) {
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8) {
static <E extends @NonNull Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8) {
return new ImmutableCollections.SetN<>(e1, e2, e3, e4, e5,
e6, e7, e8);
}
Expand All @@ -650,7 +651,7 @@ static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9) {
static <E extends @NonNull Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9) {
return new ImmutableCollections.SetN<>(e1, e2, e3, e4, e5,
e6, e7, e8, e9);
}
Expand All @@ -676,7 +677,7 @@ static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E
*
* @since 9
*/
static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9, E e10) {
static <E extends @NonNull Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E e8, E e9, E e10) {
return new ImmutableCollections.SetN<>(e1, e2, e3, e4, e5,
e6, e7, e8, e9, e10);
}
Expand Down Expand Up @@ -709,7 +710,7 @@ static <E extends Object> Set<E> of(E e1, E e2, E e3, E e4, E e5, E e6, E e7, E
*/
@SafeVarargs
@SuppressWarnings("varargs")
static <E extends Object> Set<E> of(E... elements) {
static <E extends @NonNull Object> Set<E> of(E... elements) {
switch (elements.length) { // implicit null check of elements
case 0:
return ImmutableCollections.emptySet();
Expand Down Expand Up @@ -740,7 +741,7 @@ static <E extends Object> Set<E> of(E... elements) {
* @since 10
*/
@SuppressWarnings("unchecked")
static <E extends Object> Set<E> copyOf(Collection<? extends E> coll) {
static <E extends @NonNull Object> Set<E> copyOf(Collection<? extends E> coll) {
if (coll instanceof ImmutableCollections.AbstractImmutableSet) {
return (Set<E>)coll;
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/util/concurrent/ArrayBlockingQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
* @param <E> the type of elements held in this queue
*/
@AnnotatedFor({"nullness"})
public class ArrayBlockingQueue<E extends Object> extends AbstractQueue<E>
public class ArrayBlockingQueue<E extends @NonNull Object> extends AbstractQueue<E>
implements BlockingQueue<E>, java.io.Serializable {

/*
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
* @param <E> the type of elements held in this deque
*/
@AnnotatedFor({"nullness"})
public class LinkedBlockingDeque<E extends Object>
public class LinkedBlockingDeque<E extends @NonNull Object>
extends AbstractQueue<E>
implements BlockingDeque<E>, java.io.Serializable {

Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/util/concurrent/LinkedBlockingQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
* @param <E> the type of elements held in this queue
*/
@AnnotatedFor({"nullness"})
public class LinkedBlockingQueue<E extends Object> extends AbstractQueue<E>
public class LinkedBlockingQueue<E extends @NonNull Object> extends AbstractQueue<E>
implements BlockingQueue<E>, java.io.Serializable {
private static final long serialVersionUID = -6903933977591709194L;

Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
*/
@AnnotatedFor({"nullness"})
@SuppressWarnings("unchecked")
public class PriorityBlockingQueue<E extends Object> extends AbstractQueue<E>
public class PriorityBlockingQueue<E extends @NonNull Object> extends AbstractQueue<E>
implements BlockingQueue<E>, java.io.Serializable {
private static final long serialVersionUID = 5595510919245408276L;

Expand Down
Loading