Merge pull request #372 from atlanhq/chris

Remove object field spacing from generated custom package JSONs
atlanhq · Dec 6, 2023 · bab5adb · bab5adb
2 parents e685131 + 7d7aca4
commit bab5adb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/package-toolkit/config/src/main/kotlin/com/atlan/pkg/CustomPackage.kt b/package-toolkit/config/src/main/kotlin/com/atlan/pkg/CustomPackage.kt
@@ -22,6 +22,8 @@ import com.atlan.pkg.config.widgets.NumericInput
 import com.atlan.util.StringUtils
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter
+import com.fasterxml.jackson.core.util.Separators
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper
@@ -134,7 +136,7 @@ open class CustomPackage(
      * @return package.json content
      */
     fun packageJSON(): String {
-        return json.writerWithDefaultPrettyPrinter().writeValueAsString(pkg)
+        return json.writer(pp).writeValueAsString(pkg)
     }
 
     /**
@@ -233,6 +235,7 @@ open class CustomPackage(
             .build()
             .registerKotlinModule()
         val json: ObjectMapper = jacksonObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL)
+        val pp: DefaultPrettyPrinter = DefaultPrettyPrinter().withSeparators(Separators.createDefaultInstance().withObjectFieldValueSpacing(Separators.Spacing.AFTER))
 
         fun generate(pkg: CustomPackage, args: Array<String>) {
             when (args[0]) {

diff --git a/package-toolkit/config/src/main/kotlin/com/atlan/pkg/config/model/ConfigMap.kt b/package-toolkit/config/src/main/kotlin/com/atlan/pkg/config/model/ConfigMap.kt
@@ -2,6 +2,7 @@
    Copyright 2023 Atlan Pte. Ltd. */
 package com.atlan.pkg.config.model
 
+import com.atlan.pkg.CustomPackage.Companion.pp
 import com.atlan.pkg.config.model.ui.UIConfig
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonPropertyOrder
@@ -18,7 +19,7 @@ class ConfigMap(private val name: String, config: UIConfig) {
     val metadata = mapOf("name" to name)
     val data: Map<String, String>
     init {
-        data = mapOf("config" to mapper.writerWithDefaultPrettyPrinter().writeValueAsString(config))
+        data = mapOf("config" to mapper.writer(pp).writeValueAsString(config))
     }
     companion object {
         private val mapper = jacksonObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL)