azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Lombok] Fix behavior of ignoreNullCollections parameter of @Singular

Browse Source 
^KT-53724 Fixed
^KT-53721 Fixed
This commit is contained in:
Dmitriy Novozhilov
2022-09-09 12:36:07 +03:00
committed by teamcity
parent 2aadaee69f
commit 4ab79ed97d
4 changed files with 99 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/lombok/testData/diagnostics/builderSingularNullability.kt
Vendored
+41 -4
View File
@@ -10,6 +10,7 @@ import lombok.Singular;
@Data
public class User {
@Singular private java.util.List<String> names;
@Singular private java.util.Map<Integer, Integer> pairs;
}
// FILE: UserWithoutNull.java
@@ -21,6 +22,7 @@ import lombok.Singular;
@Data
public class UserWithoutNull {
@Singular(ignoreNullCollections = false) private java.util.List<String> names;
@Singular(ignoreNullCollections = false) private java.util.Map<Integer, Integer> pairs;
}
// FILE: UserWithNull.java
@@ -32,19 +34,54 @@ import lombok.Singular;
@Data
public class UserWithNull {
@Singular(ignoreNullCollections = true) private java.util.List<String> names;
@Singular(ignoreNullCollections = true) private java.util.Map<Integer, Integer> pairs;
}
// FILE: test.kt
fun test() {
fun test_1() {
User.builder()
.name("User")
.name(<!NULL_FOR_NONNULL_TYPE!>null<!>) // error
.name(null)
.names(listOf("other"))
.names(listOf(null))
.names(<!NULL_FOR_NONNULL_TYPE!>null<!>)
.pair(null, 1)
.pair(1, null)
.pairs(mapOf(1 to 1))
.pairs(mapOf(null to 1))
.pairs(mapOf(1 to null))
.pairs(mapOf(null to null))
.pairs(<!NULL_FOR_NONNULL_TYPE!>null<!>)
}
fun test_2() {
UserWithoutNull.builder()
.name("User")
.name(<!NULL_FOR_NONNULL_TYPE!>null<!>) // error
.name(null)
.names(listOf("other"))
.names(listOf(null))
.names(<!NULL_FOR_NONNULL_TYPE!>null<!>)
.pair(null, 1)
.pair(1, null)
.pairs(mapOf(1 to 1))
.pairs(mapOf(null to 1))
.pairs(mapOf(1 to null))
.pairs(mapOf(null to null))
.pairs(<!NULL_FOR_NONNULL_TYPE!>null<!>)
}
fun test_3() {
UserWithNull.builder()
.name("User")
.name(null) // ok
.name(null)
.names(listOf("other"))
.names(listOf(null))
.names(null)
.pair(null, 1)
.pair(1, null)
.pairs(mapOf(1 to 1))
.pairs(mapOf(null to 1))
.pairs(mapOf(1 to null))
.pairs(mapOf(null to null))
.pairs(null)
}