Updated for review comment

Signed-off-by: MichaelMorris <[email protected]>
fabric8io · Feb 4, 2025 · 0dc00af · 0dc00af
1 parent 4aeb500
commit 0dc00af
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/crd-generator/api-v2/src/main/java/io/fabric8/crdv2/generator/CRDGenerator.java b/crd-generator/api-v2/src/main/java/io/fabric8/crdv2/generator/CRDGenerator.java
@@ -20,7 +20,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.utils.ApiVersionUtil;
 import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
-import io.fabric8.kubernetes.client.utils.YamlDumpSettingsBuilder;
+import io.fabric8.kubernetes.client.utils.YamlDumpSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -219,8 +219,8 @@ public void emitCrd(HasMetadata crd, Set<String> dependentClassNames, CRDGenerat
       final String outputName = getOutputName(crdName, version);
       try (final OutputStreamWriter writer = new OutputStreamWriter(output.outputFor(outputName), StandardCharsets.UTF_8)) {
         writer.write("# Generated by Fabric8 CRDGenerator, manual edits might get overwritten!\n");
-        YamlDumpSettingsBuilder yamlSettingsBuilder = new YamlDumpSettingsBuilder().setMinimizeQuotes(minQuotes);
-        String yaml = kubernetesSerialization.asYaml(crd, yamlSettingsBuilder);
+        YamlDumpSettings yamlSettings = new YamlDumpSettingsBuilder().setMinimizeQuotes(minQuotes).build();
+        String yaml = kubernetesSerialization.asYaml(crd, yamlSettings);
         // strip the explicit start added by default
         writer.write(yaml.substring(4));
         final URI fileURI = output.crdURI(outputName);

diff --git a/...-client-api/src/main/java/io/fabric8/kubernetes/client/utils/KubernetesSerialization.java b/...-client-api/src/main/java/io/fabric8/kubernetes/client/utils/KubernetesSerialization.java
@@ -188,7 +188,7 @@ public <T> String asJson(T object) {
    * @return a String containing a JSON representation of the provided object.
    */
   public <T> String asYaml(T object) {
-    return asYaml(object, new YamlDumpSettingsBuilder());
+    return asYaml(object, new YamlDumpSettingsBuilder().build());
   }
 
   /**
@@ -200,11 +200,11 @@ public <T> String asYaml(T object) {
    * be duplicated.
    *
    * @param object the object to serialize.
-   * @param yamlDumpSettingsBuilder builder for configuring YAML serialization.
+   * @param yamlDumpSettings configuration for YAML serialization.
    * @param <T> the type of the object being serialized.
    * @return a String containing a JSON representation of the provided object.
    */
-  public <T> String asYaml(T object, YamlDumpSettingsBuilder yamlDumpSettingsBuilder) {
+  public <T> String asYaml(T object, YamlDumpSettings yamlDumpSettings) {
     DumpSettings settings = DumpSettings.builder()
         .setExplicitStart(true).setDefaultFlowStyle(FlowStyle.BLOCK).build();
     final Dump yaml = new Dump(settings, new StandardRepresenter(settings) {
@@ -224,7 +224,7 @@ protected NodeTuple representMappingEntry(java.util.Map.Entry<?, ?> entry) {
           }
         }
         org.snakeyaml.engine.v2.nodes.Node nodeKey = representData(key);
-        quote = !yamlDumpSettingsBuilder.build().isMinQuotes();
+        quote = !yamlDumpSettings.isMinQuotes();
         return new NodeTuple(nodeKey, representData(entry.getValue()));
       }
 

diff --git a/...ent-api/src/test/java/io/fabric8/kubernetes/client/utils/KubernetesSerializationTest.java b/...ent-api/src/test/java/io/fabric8/kubernetes/client/utils/KubernetesSerializationTest.java
@@ -79,10 +79,10 @@ void asYaml() throws Exception {
       String result = kubernetesSerialization.asYaml(crd);
       assertThat(result).asString().contains("\"widgets.test.fabric8.io\"");
 
-      result = kubernetesSerialization.asYaml(crd, new YamlDumpSettingsBuilder());
+      result = kubernetesSerialization.asYaml(crd, new YamlDumpSettingsBuilder().build());
       assertThat(result).asString().contains("\"widgets.test.fabric8.io\"");
 
-      result = kubernetesSerialization.asYaml(crd, new YamlDumpSettingsBuilder().setMinimizeQuotes(true));
+      result = kubernetesSerialization.asYaml(crd, new YamlDumpSettingsBuilder().setMinimizeQuotes(true).build());
       assertThat(result).asString().contains("widgets.test.fabric8.io").doesNotContain("\"widgets.test.fabric8.io\"");
     }