From 75f768353c2c59c98500b5867cbf19ba170a5f38 Mon Sep 17 00:00:00 2001 From: Jan Guegel Date: Thu, 18 Dec 2025 15:05:40 +0100 Subject: [PATCH 1/2] fix double spaces in fullName by cleaning with regex --- .../main/kotlin/org/fossify/commons/models/contacts/Contact.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt b/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt index 208ed2030..f183a17f2 100644 --- a/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt +++ b/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt @@ -173,7 +173,7 @@ data class Contact( } val lastPart = if (startWithSurname) firstMiddle else surname val suffixComma = if (suffix.isEmpty()) "" else ", $suffix" - val fullName = "$prefix $firstPart $lastPart$suffixComma".trim() + val fullName = "$prefix $firstPart $lastPart$suffixComma".trim().replace(Regex("\\s+"), " ") val organization = getFullCompany() val email = emails.firstOrNull()?.value?.trim() val phoneNumber = phoneNumbers.firstOrNull()?.normalizedNumber From 76eeecd36bac184dfa41496b7dbc838c3c440da5 Mon Sep 17 00:00:00 2001 From: Jan Guegel Date: Thu, 18 Dec 2025 15:33:54 +0100 Subject: [PATCH 2/2] use recommended snippet from naveensingh --- .../kotlin/org/fossify/commons/models/contacts/Contact.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt b/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt index f183a17f2..9b7ebfcae 100644 --- a/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt +++ b/commons/src/main/kotlin/org/fossify/commons/models/contacts/Contact.kt @@ -173,7 +173,9 @@ data class Contact( } val lastPart = if (startWithSurname) firstMiddle else surname val suffixComma = if (suffix.isEmpty()) "" else ", $suffix" - val fullName = "$prefix $firstPart $lastPart$suffixComma".trim().replace(Regex("\\s+"), " ") + val fullName = listOfNotNull(prefix, firstPart, "$lastPart$suffixComma") + .filter { it.isNotBlank() } + .joinToString(" ") val organization = getFullCompany() val email = emails.firstOrNull()?.value?.trim() val phoneNumber = phoneNumbers.firstOrNull()?.normalizedNumber