Skip to content

Make Map.entry require nonnull parameters #178

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

Merged
merged 4 commits into from
Sep 14, 2023
Merged

Make Map.entry require nonnull parameters #178

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dddef51
Make Map.entry require nonnull parameters
agentgt Aug 17, 2023
66a0ca5
Merge ../jdk-branch-master into Map_entry_nonnull
mernst Aug 25, 2023
50e4ec0
Annotate `copyOf()` and `of()`
mernst Aug 25, 2023
704e7c8
Merge branch 'master' into Map_entry_nonnull
smillst Sep 13, 2023
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
28 changes: 14 additions & 14 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 @@ -641,7 +641,7 @@ public static <K, V> Comparator<Map.Entry<K, V>> comparingByValue(Comparator<? s
* @since 17
*/
@SuppressWarnings("unchecked")
public static <K, V> Map.Entry<K, V> copyOf(Map.Entry<? extends K, ? extends V> e) {
public static <K extends @NonNull Object, V extends @NonNull Object> Map.Entry<K, V> copyOf(Map.Entry<? extends K, ? extends V> e) {
Objects.requireNonNull(e);
if (e instanceof KeyValueHolder) {
return (Map.Entry<K, V>) e;
Expand Down Expand Up @@ -1396,7 +1396,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 @@ -1416,7 +1416,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 @@ -1438,7 +1438,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 @@ -1462,7 +1462,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 @@ -1488,7 +1488,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 @@ -1516,7 +1516,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 @@ -1548,7 +1548,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 @@ -1582,7 +1582,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 @@ -1618,7 +1618,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 @@ -1656,7 +1656,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 @@ -1695,7 +1695,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
@SuppressWarnings("unchecked")
var map = (Map<K,V>) ImmutableCollections.EMPTY_MAP;
Expand Down Expand Up @@ -1751,7 +1751,7 @@ static <K extends Object, V extends Object> Map<K, V> ofEntries(Entry<? extends
* @see Map#ofEntries Map.ofEntries()
* @since 9
*/
static <K, V> Entry<K, V> entry(K k, V v) {
static <K extends @NonNull Object, V extends @NonNull Object> Entry<K, V> entry(@NonNull K k, @NonNull V v) {
// KeyValueHolder checks for nulls
return new KeyValueHolder<>(k, v);
}
Expand All @@ -1774,7 +1774,7 @@ static <K, V> Entry<K, V> entry(K k, V v) {
* @since 10
*/
@SuppressWarnings({"rawtypes","unchecked"})
static <K, V> 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