From 847f47ee0172ae336176c312eba5ceee0152278b Mon Sep 17 00:00:00 2001
From: Andreas Hufler <andreas.hufler@aboutbits.it>
Date: Tue, 13 Jan 2026 10:30:37 +0100
Subject: [PATCH 1/2] fix nullability issue

---
 .../springboot/toolbox/util/CollectUtil.java          |  7 ++-----
 .../springboot/toolbox/util/CollectUtilTest.java      | 11 +++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/it/aboutbits/springboot/toolbox/util/CollectUtil.java b/src/main/java/it/aboutbits/springboot/toolbox/util/CollectUtil.java
index 5631699..0ad559a 100644
--- a/src/main/java/it/aboutbits/springboot/toolbox/util/CollectUtil.java
+++ b/src/main/java/it/aboutbits/springboot/toolbox/util/CollectUtil.java
@@ -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;
@@ -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));
     }
 
@@ -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));
     }
 }
diff --git a/src/test/java/it/aboutbits/springboot/toolbox/util/CollectUtilTest.java b/src/test/java/it/aboutbits/springboot/toolbox/util/CollectUtilTest.java
index 4d605fd..7cf8768 100644
--- a/src/test/java/it/aboutbits/springboot/toolbox/util/CollectUtilTest.java
+++ b/src/test/java/it/aboutbits/springboot/toolbox/util/CollectUtilTest.java
@@ -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;
@@ -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());
@@ -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(
@@ -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());
@@ -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());
@@ -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());

From cbd42faaf68a46073f6a35f67e91b2e044f6b5a7 Mon Sep 17 00:00:00 2001
From: Andreas Hufler <andreas.hufler@aboutbits.it>
Date: Tue, 13 Jan 2026 10:31:23 +0100
Subject: [PATCH 2/2] update deps

---
 pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index cdca341..7f67ccb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>