fix broken placeholder when empty value

MeilCli · Jun 14, 2020 · 072349a · 072349a
1 parent 06f2e41
commit 072349a
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 30 deletions.
diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomDeveloper.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomDeveloper.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
 
@@ -26,8 +27,8 @@ data class PomDeveloper(
     )
 
     override val name: String?
-        get() = nameValue?.value
+        get() = nameValue?.value?.toNullIfEmpty()
 
     override val organization: String?
-        get() = organizationValue?.value
+        get() = organizationValue?.value?.toNullIfEmpty()
 }
diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomDeveloperNoNameSpace.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomDeveloperNoNameSpace.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
 
@@ -26,8 +27,8 @@ data class PomDeveloperNoNameSpace(
     )
 
     override val name: String?
-        get() = nameValue?.value
+        get() = nameValue?.value?.toNullIfEmpty()
 
     override val organization: String?
-        get() = organizationValue?.value
+        get() = organizationValue?.value?.toNullIfEmpty()
 }
diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomLicense.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomLicense.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
 
@@ -26,8 +27,8 @@ data class PomLicense(
     )
 
     override val name: String?
-        get() = nameValue?.value
+        get() = nameValue?.value?.toNullIfEmpty()
 
     override val url: String?
-        get() = urlValue?.value
+        get() = urlValue?.value?.toNullIfEmpty()
 }
diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomLicenseNoNameSpace.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomLicenseNoNameSpace.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
 
@@ -26,8 +27,8 @@ data class PomLicenseNoNameSpace(
     )
 
     override val name: String?
-        get() = nameValue?.value
+        get() = nameValue?.value?.toNullIfEmpty()
 
     override val url: String?
-        get() = urlValue?.value
+        get() = urlValue?.value?.toNullIfEmpty()
 }
diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomOrganization.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomOrganization.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
 
@@ -18,5 +19,5 @@ data class PomOrganization(
     )
 
     override val name: String?
-        get() = nameValue?.value
+        get() = nameValue?.value?.toNullIfEmpty()
 }
diff --git a/...-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomOrganizationNoNameSpace.kt b/...-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomOrganizationNoNameSpace.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
 
@@ -18,5 +19,5 @@ data class PomOrganizationNoNameSpace(
     )
 
     override val name: String?
-        get() = nameValue?.value
+        get() = nameValue?.value?.toNullIfEmpty()
 }
diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomParentProject.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomParentProject.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
 
@@ -34,11 +35,11 @@ data class PomParentProject(
     )
 
     override val group: String?
-        get() = groupValue?.value
+        get() = groupValue?.value?.toNullIfEmpty()
 
     override val artifact: String?
-        get() = artifactValue?.value
+        get() = artifactValue?.value?.toNullIfEmpty()
 
     override val version: String?
-        get() = versionValue?.value
+        get() = versionValue?.value?.toNullIfEmpty()
 }
diff --git a/...core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomParentProjectNoNameSpace.kt b/...core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomParentProjectNoNameSpace.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
 
@@ -34,11 +35,11 @@ data class PomParentProjectNoNameSpace(
     )
 
     override val group: String?
-        get() = groupValue?.value
+        get() = groupValue?.value?.toNullIfEmpty()
 
     override val artifact: String?
-        get() = artifactValue?.value
+        get() = artifactValue?.value?.toNullIfEmpty()
 
     override val version: String?
-        get() = versionValue?.value
+        get() = versionValue?.value?.toNullIfEmpty()
 }
diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomProject.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomProject.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlChildrenName
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
@@ -69,37 +70,37 @@ data class PomProject(
     )
 
     override var group: String?
-        get() = groupValue?.value
+        get() = groupValue?.value?.toNullIfEmpty()
         set(value) {
             groupValue = value?.let { PomGroup(it) }
         }
 
     override var artifact: String?
-        get() = artifactValue?.value
+        get() = artifactValue?.value?.toNullIfEmpty()
         set(value) {
             artifactValue = value?.let { PomArtifact(it) }
         }
 
     override var version: String?
-        get() = versionValue?.value
+        get() = versionValue?.value?.toNullIfEmpty()
         set(value) {
             versionValue = value?.let { PomVersion(it) }
         }
 
     override var name: String?
-        get() = nameValue?.value
+        get() = nameValue?.value?.toNullIfEmpty()
         set(value) {
             nameValue = value?.let { PomName(it) }
         }
 
     override var description: String?
-        get() = descriptionValue?.value
+        get() = descriptionValue?.value?.toNullIfEmpty()
         set(value) {
             descriptionValue = value?.let { PomDescription(it) }
         }
 
     override var url: String?
-        get() = urlValue?.value
+        get() = urlValue?.value?.toNullIfEmpty()
         set(value) {
             urlValue = value?.let { PomUrl(it) }
         }

diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomProjectNoNameSpace.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/entities/PomProjectNoNameSpace.kt
@@ -1,6 +1,7 @@
 package net.meilcli.librarian.plugin.entities
 
 import kotlinx.serialization.Serializable
+import net.meilcli.librarian.plugin.extensions.toNullIfEmpty
 import nl.adaptivity.xmlutil.serialization.XmlChildrenName
 import nl.adaptivity.xmlutil.serialization.XmlSerialName
 import nl.adaptivity.xmlutil.serialization.XmlValue
@@ -69,37 +70,37 @@ data class PomProjectNoNameSpace(
     )
 
     override var group: String?
-        get() = groupValue?.value
+        get() = groupValue?.value?.toNullIfEmpty()
         set(value) {
             groupValue = value?.let { PomGroup(it) }
         }
 
     override var artifact: String?
-        get() = artifactValue?.value
+        get() = artifactValue?.value?.toNullIfEmpty()
         set(value) {
             artifactValue = value?.let { PomArtifact(it) }
         }
 
     override var version: String?
-        get() = versionValue?.value
+        get() = versionValue?.value?.toNullIfEmpty()
         set(value) {
             versionValue = value?.let { PomVersion(it) }
         }
 
     override var name: String?
-        get() = nameValue?.value
+        get() = nameValue?.value?.toNullIfEmpty()
         set(value) {
             nameValue = value?.let { PomName(it) }
         }
 
     override var description: String?
-        get() = descriptionValue?.value
+        get() = descriptionValue?.value?.toNullIfEmpty()
         set(value) {
             descriptionValue = value?.let { PomDescription(it) }
         }
 
     override var url: String?
-        get() = urlValue?.value
+        get() = urlValue?.value?.toNullIfEmpty()
         set(value) {
             urlValue = value?.let { PomUrl(it) }
         }

diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/extensions/StringExtensions.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/extensions/StringExtensions.kt
@@ -0,0 +1,5 @@
+package net.meilcli.librarian.plugin.extensions
+
+fun String.toNullIfEmpty(): String? {
+    return if (isEmpty()) null else this
+}
diff --git a/plugin-core/src/test/kotlin/net/meilcli/librarian/plugin/PomFileTest.kt b/plugin-core/src/test/kotlin/net/meilcli/librarian/plugin/PomFileTest.kt
@@ -61,7 +61,7 @@ class PomFileTest {
         assertEquals("1.0.0", project.version)
         assertEquals("test-name", project.name)
         assertEquals("test-description", project.description)
-        assertEquals("", project.url)
+        assertNull(project.url)
         assertEquals(1, project.licenses?.size)
         assertEquals("The Apache License, Version 2.0", project.licenses?.first()?.name)
         assertEquals("http://www.apache.org/licenses/LICENSE-2.0.txt", project.licenses?.first()?.url)
@@ -85,7 +85,7 @@ class PomFileTest {
         assertEquals("1.0.0", project.version)
         assertEquals("test-name", project.name)
         assertEquals("test-description", project.description)
-        assertEquals("", project.url)
+        assertNull(project.url)
         assertEquals(1, project.licenses?.size)
         assertEquals("The Apache License, Version 2.0", project.licenses?.first()?.name)
         assertEquals("http://www.apache.org/licenses/LICENSE-2.0.txt", project.licenses?.first()?.url)