Skip to content

fix nullability issue #46

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
SirCotare merged 2 commits into from
Jan 13, 2026
Merged

fix nullability issue #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
847f47e
fix nullability issue
SirCotare Jan 13, 2026
cbd42fa
update deps
SirCotare Jan 13, 2026
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
7 changes: 4 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -17,8 +18,8 @@

<properties>
<java.version>25</java.version>
<errorprone.version>2.45.0</errorprone.version>
<nullaway.version>0.12.14</nullaway.version>
<errorprone.version>2.46.0</errorprone.version>
<nullaway.version>0.12.15</nullaway.version>
</properties>

<dependencyManagement>
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/it/aboutbits/springboot/toolbox/util/CollectUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package it.aboutbits.springboot.toolbox.util;

import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import org.springframework.data.util.Streamable;

import java.util.Collection;
Expand Down Expand Up @@ -94,12 +93,11 @@ public static <T, R> Stream<R> collectToStream(Stream<T> items, NullableFunction
}

public static <T, K, R> Map<K, R> collectToMap(
Collection<@Nullable T> items,
Collection<T> items,
Function<T, K> keyMapper,
Function<T, R> valueMapper
) {
return items.stream()
.filter(Objects::nonNull)
.collect(Collectors.toMap(keyMapper, valueMapper));
}

Expand All @@ -113,12 +111,11 @@ public static <T, K, R> Map<K, R> collectToMap(
}

public static <T, K, R> Map<K, R> collectToMap(
Stream<@Nullable T> items,
Stream<T> items,
Function<T, K> keyMapper,
Function<T, R> valueMapper
) {
return items
.filter(Objects::nonNull)
.collect(Collectors.toMap(keyMapper, valueMapper));
}
}
11 changes: 5 additions & 6 deletions src/test/java/it/aboutbits/springboot/toolbox/util/CollectUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package it.aboutbits.springboot.toolbox.util;

import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -381,7 +380,7 @@ class CollectToMap {
@DisplayName("Should convert Collection to Map using key and value mappers")
void shouldConvertCollectionToMapUsingMappers() {
// given
var items = (Collection<@Nullable String>) Arrays.asList("a", "bb", "ccc");
var items = (Collection<String>) Arrays.asList("a", "bb", "ccc");

// when
var result = CollectUtil.collectToMap(items, String::length, Function.identity());
Expand All @@ -398,7 +397,7 @@ void shouldConvertCollectionToMapUsingMappers() {
@DisplayName("Should throw on duplicate keys according to Collectors.toMap default behavior")
void shouldThrowOnDuplicateKeys() {
// given
var items = (Collection<@Nullable String>) Arrays.asList("a", "b"); // both have length of 1
var items = (Collection<String>) Arrays.asList("a", "b"); // both have length of 1

// when / then
assertThatIllegalStateException().isThrownBy(
Expand Down Expand Up @@ -431,7 +430,7 @@ void shouldConvertStreamableToMapUsingMappers() {
@DisplayName("Should convert Stream to Map using key and value mappers")
void shouldConvertStreamToMapUsingMappers() {
// given
var items = Stream.<@Nullable String>of("m", "nn");
var items = Stream.of("m", "nn");

// when
var result = CollectUtil.collectToMap(items, String::length, Function.identity());
Expand All @@ -447,7 +446,7 @@ void shouldConvertStreamToMapUsingMappers() {
@DisplayName("Should return empty map for empty collection")
void shouldReturnEmptyMapForEmptyCollection() {
// given
var items = Collections.<@Nullable String>emptyList();
var items = Collections.<String>emptyList();

// when
var result = CollectUtil.collectToMap(items, String::length, Function.identity());
Expand All @@ -473,7 +472,7 @@ void shouldReturnEmptyMapForEmptyStreamable() {
@DisplayName("Should return empty map for empty stream")
void shouldReturnEmptyMapForEmptyStream() {
// given
var items = Stream.<@Nullable String>empty();
var items = Stream.<String>empty();

// when
var result = CollectUtil.collectToMap(items, String::length, Function.identity());
Expand Down