fix nullability issues

Author: SirCotare

src/main/java/it/aboutbits/springboot/toolbox/autoconfiguration/web/CustomTypeConfiguration.java

@@ -48,8 +48,8 @@ public JsonMapperBuilderCustomizer jsonCustomizer(CustomTypeScanner configuratio
 
         // dynamic deserializers
         configuration.getRelevantTypes()
-                .forEach(type ->
-                                 module.addDeserializer(type, new CustomTypeDeserializer(type))
+                .forEach(
+                        type -> module.addDeserializer(type, new CustomTypeDeserializer(type))
                 );
 
         // type-based deserializer

src/main/java/it/aboutbits/springboot/toolbox/jackson/CustomTypeSerializer.java

@@ -28,7 +28,6 @@ public void serialize(
             case String stringValue -> jsonGenerator.writeString(stringValue);
             case UUID uuidValue -> jsonGenerator.writeString(uuidValue.toString());
             case Enum<?> enumValue -> jsonGenerator.writeString(enumValue.name());
-            case null -> jsonGenerator.writeNull();
             default -> jsonGenerator.writeRawValue(String.valueOf(value));
         }
     }

src/main/java/it/aboutbits/springboot/toolbox/swagger/customization/custom_type/CustomTypePropertyCustomizer.java

@@ -36,7 +36,7 @@ public Schema<?> customize(Schema property, AnnotatedType annotatedType) {
             }
 
             if (CustomType.class.isAssignableFrom(rawClass)) {
-                Class<?> wrappedType = null;
+                Class<?> wrappedType;
                 if (rawClass.equals(EntityId.class)) {
                     wrappedType = simpleType.getBindings()
                             .getTypeParameters()

src/main/java/it/aboutbits/springboot/toolbox/swagger/customization/default_not_null/NullableCustomizer.java

@@ -70,7 +70,7 @@ private static boolean isNullable(Schema<?> property) {
 
         if (property.getItems() != null && property.getItems().get$ref() != null && property.getItems()
                 .get$ref()
-                .endsWith("?nullable=true")) {
+                .endsWith(NULLABLE_MARKER)) {
             return true;
         }
 

src/main/java/it/aboutbits/springboot/toolbox/util/CollectUtil.java

@@ -1,6 +1,7 @@
 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;
@@ -23,68 +24,77 @@ public final class CollectUtil {
     private CollectUtil() {
     }
 
-    public static <T, R> Set<R> collectToSet(Collection<T> items, Function<T, R> mapper) {
+    public static <T, R> Set<R> collectToSet(Collection<T> items, Function<T, @Nullable R> mapper) {
         return items.stream()
                 .map(mapper)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toUnmodifiableSet());
     }
 
-    public static <T, R> Set<R> collectToSet(Streamable<T> items, Function<T, R> mapper) {
+    public static <T, R> Set<R> collectToSet(Streamable<T> items, Function<T, @Nullable R> mapper) {
         return items.stream()
                 .map(mapper)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toUnmodifiableSet());
     }
 
-    public static <T, R> Set<R> collectToSet(Stream<T> items, Function<T, R> mapper) {
+    public static <T, R> Set<R> collectToSet(Stream<T> items, Function<T, @Nullable R> mapper) {
         return items
                 .map(mapper)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toUnmodifiableSet());
     }
 
-    public static <T, R> List<R> collectToList(Collection<T> items, Function<T, R> mapper) {
+    @SuppressWarnings("java:S6204")
+    public static <T, R> List<R> collectToList(Collection<T> items, Function<T, @Nullable R> mapper) {
+        //noinspection SimplifyStreamApiCallChains
         return items.stream()
                 .map(mapper)
                 .filter(Objects::nonNull)
-                .toList();
+                .collect(Collectors.toUnmodifiableList());
     }
 
-    public static <T, R> List<R> collectToList(Streamable<T> items, Function<T, R> mapper) {
+    @SuppressWarnings("java:S6204")
+    public static <T, R> List<R> collectToList(Streamable<T> items, Function<T, @Nullable R> mapper) {
+        //noinspection SimplifyStreamApiCallChains
         return items.stream()
                 .map(mapper)
                 .filter(Objects::nonNull)
-                .toList();
+                .collect(Collectors.toUnmodifiableList());
     }
 
-    public static <T, R> List<R> collectToList(Stream<T> items, Function<T, R> mapper) {
+    @SuppressWarnings("java:S6204")
+    public static <T, R> List<R> collectToList(Stream<T> items, Function<T, @Nullable R> mapper) {
+        //noinspection SimplifyStreamApiCallChains
         return items
                 .map(mapper)
                 .filter(Objects::nonNull)
-                .toList();
+                .collect(Collectors.toUnmodifiableList());
     }
 
-    public static <T, R> Stream<R> collectToStream(Collection<T> items, Function<T, R> mapper) {
+    public static <T, R> Stream<R> collectToStream(Collection<T> items, Function<T, @Nullable R> mapper) {
+        //noinspection NullableProblems
         return items.stream()
                 .map(mapper)
                 .filter(Objects::nonNull);
     }
 
-    public static <T, R> Stream<R> collectToStream(Streamable<T> items, Function<T, R> mapper) {
+    public static <T, R> Stream<R> collectToStream(Streamable<T> items, Function<T, @Nullable R> mapper) {
+        //noinspection NullableProblems
         return items.stream()
                 .map(mapper)
                 .filter(Objects::nonNull);
     }
 
-    public static <T, R> Stream<R> collectToStream(Stream<T> items, Function<T, R> mapper) {
+    public static <T, R> Stream<R> collectToStream(Stream<T> items, Function<T, @Nullable R> mapper) {
+        //noinspection NullableProblems
         return items
                 .map(mapper)
                 .filter(Objects::nonNull);
     }
 
     public static <T, K, R> Map<K, R> collectToMap(
-            Collection<T> items,
+            Collection<@Nullable T> items,
             Function<T, K> keyMapper,
             Function<T, R> valueMapper
     ) {
@@ -99,12 +109,11 @@ public static <T, K, R> Map<K, R> collectToMap(
             Function<T, R> valueMapper
     ) {
         return items.stream()
-                .filter(Objects::nonNull)
                 .collect(Collectors.toMap(keyMapper, valueMapper));
     }
 
     public static <T, K, R> Map<K, R> collectToMap(
-            Stream<T> items,
+            Stream<@Nullable T> items,
             Function<T, K> keyMapper,
             Function<T, R> valueMapper
     ) {

src/main/java/it/aboutbits/springboot/toolbox/web/EntityIdPropertyEditor.java

@@ -19,7 +19,7 @@ public String getAsText() {
 
     @Override
     public void setAsText(String text) throws IllegalArgumentException {
-        EntityId<?> value = null;
+        EntityId<?> value;
         try {
             var theValue = Long.parseLong(text);
             value = new EntityId<Long>() {

src/test/java/it/aboutbits/springboot/toolbox/TestApp.java

@@ -10,8 +10,7 @@
 @RegisterCustomTypesWithJacksonAndMvc
 @NullMarked
 public class TestApp {
-
-    public static void main(String[] args) {
+    static void main(String[] args) {
         SpringApplication.run(TestApp.class, args);
     }
 }

src/test/java/it/aboutbits/springboot/toolbox/autoconfiguration/persistence/impl/jpa/CustomTypeEnumTestModel.java

@@ -10,6 +10,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.JavaType;
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.NullUnmarked;
 
@@ -18,7 +19,7 @@
 @Setter
 @Table(name = "custom_type_enum_test_model")
 @NullUnmarked
-public class CustomTypeEnumTestModel implements Identified<CustomTypeEnumTestModel.ID> {
+public class CustomTypeEnumTestModel implements Identified<CustomTypeEnumTestModel.@NonNull ID> {
     @Id
     @JavaType(CustomTypeEnumTestModel.ID.JavaType.class)
     private ID id;

src/test/java/it/aboutbits/springboot/toolbox/autoconfiguration/persistence/impl/jpa/CustomTypeTestModel.java

@@ -20,6 +20,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.JavaType;
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.NullUnmarked;
 
@@ -30,7 +31,7 @@
 @Setter
 @Table(name = "custom_type_test_model")
 @NullUnmarked
-public class CustomTypeTestModel implements Identified<CustomTypeTestModel.ID> {
+public class CustomTypeTestModel implements Identified<CustomTypeTestModel.@NonNull ID> {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @JavaType(CustomTypeTestModel.ID.JavaType.class)

src/test/java/it/aboutbits/springboot/toolbox/persistence/javatype/impl/jpa/WrapperTypesModel.java

@@ -71,14 +71,16 @@
 import org.hibernate.annotations.JdbcType;
 import org.hibernate.type.descriptor.jdbc.CharJdbcType;
 import org.hibernate.type.descriptor.jdbc.UUIDJdbcType;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.NullUnmarked;
 
 @Entity
 @Getter
 @Setter
 @Table(name = "wrapper_type_test_model")
 @NullUnmarked
-public class WrapperTypesModel implements Identified<WrapperTypesModel.ID> {
+public class WrapperTypesModel implements Identified<WrapperTypesModel.@NonNull ID> {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @JavaType(ID.JavaType.class)
@@ -208,6 +210,7 @@ public class WrapperTypesModel implements Identified<WrapperTypesModel.ID> {
     @JavaType(WrapEnumClassJavaType.class)
     private WrapEnumClass enumValueClass;
 
+    @NullMarked
     public record ID(
             Long value
     ) implements EntityId<Long> {