Skip to content

Remove redundant @NonNull annotations #123

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

Open
aosen-xiong wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove redundant @NonNull annotations #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3391dc
Fix: Remove type parameter upperbound for `ConcurrentHashMap`
aosen-xiong May 7, 2025
fccf774
Remove redundant `@NonNull` annotations
aosen-xiong May 8, 2025
bf15154
Merge branch 'master' into concurrent-hashmap
wmdietl May 13, 2025
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
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/lang/Comparable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
* @since 1.2
*/
@AnnotatedFor({"lock", "nullness", "index"})
public interface Comparable<T extends @NonNull Object> {
public interface Comparable<T extends Object> {
/**
* Compares this object with the specified object for order. Returns a
* negative integer, zero, or a positive integer as this object is less
Expand Down
5 changes: 2 additions & 3 deletions src/java.base/share/classes/java/lang/reflect/ParameterizedType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

package java.lang.reflect;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.framework.qual.AnnotatedFor;

Expand Down Expand Up @@ -68,7 +67,7 @@ public interface ParameterizedType extends Type {
* be instantiated for any reason
* @since 1.5
*/
@NonNull Type @NonNull [] getActualTypeArguments();
Type[] getActualTypeArguments();

/**
* Returns the {@code Type} object representing the class or interface
Expand All @@ -78,7 +77,7 @@ public interface ParameterizedType extends Type {
* that declared this type
* @since 1.5
*/
@NonNull Type getRawType();
Type getRawType();

/**
* Returns a {@code Type} object representing the type that this type
Expand Down
3 changes: 1 addition & 2 deletions src/java.base/share/classes/java/util/ArrayDeque.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import org.checkerframework.checker.nonempty.qual.NonEmpty;
import org.checkerframework.checker.nonempty.qual.PolyNonEmpty;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.checker.signedness.qual.PolySigned;
Expand Down Expand Up @@ -103,7 +102,7 @@
* @since 1.6
*/
@AnnotatedFor({"lock", "nullness", "index"})
public class ArrayDeque<E extends @NonNull Object> extends AbstractCollection<E>
public class ArrayDeque<E extends Object> extends AbstractCollection<E>
implements Deque<E>, Cloneable, Serializable
{
/*
Expand Down
3 changes: 1 addition & 2 deletions src/java.base/share/classes/java/util/Hashtable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.checkerframework.checker.nullness.qual.EnsuresKeyFor;
import org.checkerframework.checker.nullness.qual.EnsuresKeyForIf;
import org.checkerframework.checker.nullness.qual.KeyFor;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.checker.signedness.qual.UnknownSignedness;
Expand Down Expand Up @@ -151,7 +150,7 @@
*/
@CFComment({"lock: This collection can only contain nonnull values"})
@AnnotatedFor({"lock", "nullness", "index"})
public class Hashtable<K extends @NonNull Object,V extends @NonNull Object>
public class Hashtable<K extends Object,V extends Object>
extends Dictionary<K,V>
implements Map<K,V>, Cloneable, java.io.Serializable {

Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/util/Objects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ public static boolean nonNull(@GuardSatisfied @Nullable @UnknownSignedness Objec
* the {@code supplier.get()} value is {@code null}
* @since 9
*/
public static <T extends @NonNull Object> T requireNonNullElseGet(@Nullable T obj, Supplier<? extends T> supplier) {
public static <T extends Object> T requireNonNullElseGet(@Nullable T obj, Supplier<? extends T> supplier) {
return (obj != null) ? obj
: requireNonNull(requireNonNull(supplier, "supplier").get(), "supplier.get()");
}
Expand Down
3 changes: 1 addition & 2 deletions src/java.base/share/classes/java/util/PriorityQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmptyIf;
import org.checkerframework.checker.nonempty.qual.NonEmpty;
import org.checkerframework.checker.nonempty.qual.PolyNonEmpty;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.checker.signedness.qual.PolySigned;
Expand Down Expand Up @@ -103,7 +102,7 @@
@CFComment({"lock/nullness: This class doesn't permits null elements"})
@AnnotatedFor({"lock", "nullness", "index"})
@SuppressWarnings("unchecked")
public class PriorityQueue<E extends @NonNull Object> extends AbstractQueue<E>
public class PriorityQueue<E extends Object> extends AbstractQueue<E>
implements java.io.Serializable {

@java.io.Serial
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/util/TreeMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,7 +1651,7 @@ static <K,V> K keyOrNull(TreeMap.Entry<K,V> e) {
* Returns the key corresponding to the specified Entry.
* @throws NoSuchElementException if the Entry is null
*/
static <K> K key(@NonNull Entry<K,?> e) {
static <K> K key(Entry<K,?> e) {
if (e==null)
throw new NoSuchElementException();
return e.key;
Expand Down
5 changes: 2 additions & 3 deletions 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 @@ -39,7 +39,6 @@
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmpty;
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmptyIf;
import org.checkerframework.checker.nonempty.qual.NonEmpty;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.checker.signedness.qual.PolySigned;
Expand Down Expand Up @@ -1496,15 +1495,15 @@ public boolean removeIf(Predicate<? super E> filter) {
/**
* @throws NullPointerException {@inheritDoc}
*/
public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean removeAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> c.contains(e));
}

/**
* @throws NullPointerException {@inheritDoc}
*/
public boolean retainAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean retainAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> !c.contains(e));
}
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/util/concurrent/BlockingDeque.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
* @param <E> the type of elements held in this deque
*/
@AnnotatedFor({"nullness"})
public interface BlockingDeque<E extends @NonNull Object> extends BlockingQueue<E>, Deque<E> {
public interface BlockingDeque<E extends Object> extends BlockingQueue<E>, Deque<E> {
/*
* We have "diamond" multiple interface inheritance here, and that
* introduces ambiguities. Methods might end up with different
Expand Down
3 changes: 1 addition & 2 deletions src/java.base/share/classes/java/util/concurrent/BlockingQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmpty;
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmptyIf;
import org.checkerframework.checker.nonempty.qual.NonEmpty;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.signedness.qual.UnknownSignedness;
import org.checkerframework.dataflow.qual.Pure;
Expand Down Expand Up @@ -186,7 +185,7 @@
* @param <E> the type of elements held in this queue
*/
@AnnotatedFor({"nullness"})
public interface BlockingQueue<E extends @NonNull Object> extends Queue<E> {
public interface BlockingQueue<E extends Object> extends Queue<E> {
/**
* Inserts the specified element into this queue if it is possible to do
* so immediately without violating capacity restrictions, returning
Expand Down
11 changes: 5 additions & 6 deletions src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.checkerframework.checker.nullness.qual.EnsuresKeyForIf;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.KeyFor;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.checker.signedness.qual.PolySigned;
Expand Down Expand Up @@ -279,7 +278,7 @@
* @param <V> the type of mapped values
*/
@AnnotatedFor({"nullness"})
public class ConcurrentHashMap<K extends @NonNull Object,V extends @NonNull Object> extends AbstractMap<K,V>
public class ConcurrentHashMap<K extends Object, V extends Object> extends AbstractMap<K,V>
implements ConcurrentMap<K,V>, Serializable {
private static final long serialVersionUID = 7249069246763182397L;

Expand Down Expand Up @@ -4580,7 +4579,7 @@ public final String toString() {
}

@Pure
public final boolean containsAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public final boolean containsAll(Collection<? extends @UnknownSignedness Object> c) {
if (c != this) {
for (Object e : c) {
if (e == null || !contains(e))
Expand All @@ -4590,7 +4589,7 @@ public final boolean containsAll(Collection<? extends @NonNull @UnknownSignednes
return true;
}

public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean removeAll(Collection<? extends @UnknownSignedness Object> c) {
if (c == null) throw new NullPointerException();
boolean modified = false;
// Use (c instanceof Set) as a hint that lookup in c is as
Expand All @@ -4612,7 +4611,7 @@ public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object
return modified;
}

public final boolean retainAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public final boolean retainAll(Collection<? extends @UnknownSignedness Object> c) {
if (c == null) throw new NullPointerException();
boolean modified = false;
for (Iterator<E> it = iterator(); it.hasNext();) {
Expand Down Expand Up @@ -4804,7 +4803,7 @@ public final boolean addAll(Collection<? extends V> c) {
throw new UnsupportedOperationException();
}

@Override public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
@Override public boolean removeAll(Collection<? extends @UnknownSignedness Object> c) {
if (c == null) throw new NullPointerException();
boolean modified = false;
for (Iterator<V> it = iterator(); it.hasNext();) {
Expand Down
6 changes: 3 additions & 3 deletions src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
* @param <E> the type of elements held in this deque
*/
@AnnotatedFor({"nullness"})
public class ConcurrentLinkedDeque<E extends @NonNull Object>
public class ConcurrentLinkedDeque<E extends Object>
extends AbstractCollection<E>
implements Deque<E>, java.io.Serializable {

Expand Down Expand Up @@ -1641,15 +1641,15 @@ public boolean removeIf(Predicate<? super E> filter) {
/**
* @throws NullPointerException {@inheritDoc}
*/
public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean removeAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> c.contains(e));
}

/**
* @throws NullPointerException {@inheritDoc}
*/
public boolean retainAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean retainAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> !c.contains(e));
}
Expand Down
7 changes: 3 additions & 4 deletions src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmpty;
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmptyIf;
import org.checkerframework.checker.nonempty.qual.NonEmpty;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.checker.signedness.qual.PolySigned;
Expand Down Expand Up @@ -120,7 +119,7 @@
* @param <E> the type of elements held in this queue
*/
@AnnotatedFor({"nullness"})
public class ConcurrentLinkedQueue<E extends @NonNull Object> extends AbstractQueue<E>
public class ConcurrentLinkedQueue<E extends Object> extends AbstractQueue<E>
implements Queue<E>, java.io.Serializable {
private static final long serialVersionUID = 196745693267521676L;

Expand Down Expand Up @@ -994,15 +993,15 @@ public boolean removeIf(Predicate<? super E> filter) {
/**
* @throws NullPointerException {@inheritDoc}
*/
public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean removeAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> c.contains(e));
}

/**
* @throws NullPointerException {@inheritDoc}
*/
public boolean retainAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean retainAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> !c.contains(e));
}
Expand Down
3 changes: 1 addition & 2 deletions src/java.base/share/classes/java/util/concurrent/ConcurrentMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

import org.checkerframework.checker.signedness.qual.UnknownSignedness;
import org.checkerframework.checker.nullness.qual.EnsuresKeyFor;
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 @@ -77,7 +76,7 @@
* @param <V> the type of mapped values
*/
@AnnotatedFor({"nullness"})
public interface ConcurrentMap<K extends @NonNull Object,V extends @NonNull Object> extends Map<K,V> {
public interface ConcurrentMap<K extends Object,V extends Object> extends Map<K,V> {

/**
* {@inheritDoc}
Expand Down
5 changes: 2 additions & 3 deletions src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmptyIf;
import org.checkerframework.checker.nonempty.qual.NonEmpty;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.signedness.qual.UnknownSignedness;
import org.checkerframework.dataflow.qual.Pure;
Expand Down Expand Up @@ -105,7 +104,7 @@
* @since 1.6
*/
@AnnotatedFor({"nullness"})
public class ConcurrentSkipListSet<E extends @NonNull Object>
public class ConcurrentSkipListSet<E extends Object>
extends AbstractSet<E>
implements NavigableSet<E>, Cloneable, java.io.Serializable {

Expand Down Expand Up @@ -352,7 +351,7 @@ public boolean equals(@Nullable Object o) {
* @throws NullPointerException if the specified collection or any
* of its elements are null
*/
public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean removeAll(Collection<? extends @UnknownSignedness Object> c) {
// Override AbstractSet version to avoid unnecessary call to size()
boolean modified = false;
for (Object e : c)
Expand Down
11 changes: 5 additions & 6 deletions src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmptyIf;
import org.checkerframework.checker.nonempty.qual.NonEmpty;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.checker.signedness.qual.PolySigned;
Expand Down Expand Up @@ -670,7 +669,7 @@ public boolean containsAll(Collection<? extends @UnknownSignedness Object> c) {
* or if the specified collection is null
* @see #remove(Object)
*/
public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean removeAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> c.contains(e));
}
Expand All @@ -691,7 +690,7 @@ public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object
* or if the specified collection is null
* @see #remove(Object)
*/
public boolean retainAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean retainAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> !c.contains(e));
}
Expand Down Expand Up @@ -1313,7 +1312,7 @@ public boolean contains(@Nullable @UnknownSignedness Object o) {
}

@Pure
public boolean containsAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean containsAll(Collection<? extends @UnknownSignedness Object> c) {
final Object[] es;
final int offset;
final int size;
Expand Down Expand Up @@ -1525,12 +1524,12 @@ public void sort(Comparator<? super E> c) {
}
}

public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean removeAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> c.contains(e));
}

public boolean retainAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean retainAll(Collection<? extends @UnknownSignedness Object> c) {
Objects.requireNonNull(c);
return bulkRemove(e -> !c.contains(e));
}
Expand Down
5 changes: 2 additions & 3 deletions src/java.base/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import org.checkerframework.checker.nonempty.qual.EnsuresNonEmptyIf;
import org.checkerframework.checker.nonempty.qual.NonEmpty;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;
import org.checkerframework.checker.signedness.qual.PolySigned;
Expand Down Expand Up @@ -367,7 +366,7 @@ public boolean addAll(Collection<? extends E> c) {
* or if the specified collection is null
* @see #remove(Object)
*/
public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean removeAll(Collection<? extends @UnknownSignedness Object> c) {
return al.removeAll(c);
}

Expand All @@ -390,7 +389,7 @@ public boolean removeAll(Collection<? extends @NonNull @UnknownSignedness Object
* or if the specified collection is null
* @see #remove(Object)
*/
public boolean retainAll(Collection<? extends @NonNull @UnknownSignedness Object> c) {
public boolean retainAll(Collection<? extends @UnknownSignedness Object> c) {
return al.retainAll(c);
}

Expand Down
Loading
Loading