Use Core Schema by default as recommended by the YAML specification

krzema12 · Feb 5, 2025 · ca983e7 · ca983e7
1 parent d6ad5b6
commit ca983e7
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 27 deletions.
diff --git a/src/commonMain/kotlin/it/krzeminski/snakeyaml/engine/kmp/api/DumpSettingsBuilder.kt b/src/commonMain/kotlin/it/krzeminski/snakeyaml/engine/kmp/api/DumpSettingsBuilder.kt
@@ -21,7 +21,7 @@ import it.krzeminski.snakeyaml.engine.kmp.emitter.Emitter
 import it.krzeminski.snakeyaml.engine.kmp.exceptions.EmitterException
 import it.krzeminski.snakeyaml.engine.kmp.exceptions.YamlEngineException
 import it.krzeminski.snakeyaml.engine.kmp.nodes.Tag
-import it.krzeminski.snakeyaml.engine.kmp.schema.JsonSchema
+import it.krzeminski.snakeyaml.engine.kmp.schema.CoreSchema
 import it.krzeminski.snakeyaml.engine.kmp.schema.Schema
 import it.krzeminski.snakeyaml.engine.kmp.serializer.AnchorGenerator
 import it.krzeminski.snakeyaml.engine.kmp.serializer.NumberAnchorGenerator
@@ -54,7 +54,7 @@ class DumpSettingsBuilder internal constructor() {
     private var indentWithIndicator = false
     private var dumpComments = false
     private var isDereferenceAliases = false
-    private var schema: Schema = JsonSchema()
+    private var schema: Schema = CoreSchema()
 
     /**
      * Define flow style

diff --git a/src/commonMain/kotlin/it/krzeminski/snakeyaml/engine/kmp/api/LoadSettingsBuilder.kt b/src/commonMain/kotlin/it/krzeminski/snakeyaml/engine/kmp/api/LoadSettingsBuilder.kt
@@ -18,7 +18,7 @@ import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings.SpecVersionMutator
 import it.krzeminski.snakeyaml.engine.kmp.env.EnvConfig
 import it.krzeminski.snakeyaml.engine.kmp.exceptions.YamlVersionException
 import it.krzeminski.snakeyaml.engine.kmp.nodes.Tag
-import it.krzeminski.snakeyaml.engine.kmp.schema.JsonSchema
+import it.krzeminski.snakeyaml.engine.kmp.schema.CoreSchema
 import it.krzeminski.snakeyaml.engine.kmp.schema.Schema
 
 /**
@@ -49,7 +49,7 @@ class LoadSettingsBuilder internal constructor() {
     private var useMarks: Boolean = true
     private var envConfig: EnvConfig? = null // no ENV substitution by default
     private var codePointLimit: Int = 3 * 1024 * 1024 // 3 MB
-    private var schema: Schema = JsonSchema()
+    private var schema: Schema = CoreSchema()
 
     /**
      * Label for the input data. Can be used to improve the error message.

diff --git a/src/jvmTest/java/org/snakeyaml/engine/schema/BooleanCoreTest.java b/src/jvmTest/java/org/snakeyaml/engine/schema/BooleanCoreTest.java
@@ -15,18 +15,16 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import it.krzeminski.snakeyaml.engine.kmp.api.DumpSettings;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import it.krzeminski.snakeyaml.engine.kmp.api.Dump;
-import it.krzeminski.snakeyaml.engine.kmp.api.DumpSettings;
 import it.krzeminski.snakeyaml.engine.kmp.api.Load;
-import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings;
-import it.krzeminski.snakeyaml.engine.kmp.schema.CoreSchema;
 
 @org.junit.jupiter.api.Tag("fast")
 public class BooleanCoreTest {
 
-  Load loader = new Load(LoadSettings.builder().setSchema(new CoreSchema()).build());
+  Load loader = new Load();
 
   @Test
   void parseBoolean() {
@@ -51,7 +49,7 @@ void parseString() {
 
   @Test
   void dumpBoolean() {
-    Dump dumper = new Dump(DumpSettings.builder().setSchema(new CoreSchema()).build());
+    Dump dumper = new Dump(DumpSettings.builder().build());
     assertEquals("true\n", dumper.dumpToString(Boolean.TRUE));
     assertEquals("false\n", dumper.dumpToString(Boolean.FALSE));
   }

diff --git a/src/jvmTest/java/org/snakeyaml/engine/schema/BooleanJsonTest.java b/src/jvmTest/java/org/snakeyaml/engine/schema/BooleanJsonTest.java
@@ -15,6 +15,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings;
+import it.krzeminski.snakeyaml.engine.kmp.schema.JsonSchema;
 import org.junit.jupiter.api.Test;
 import it.krzeminski.snakeyaml.engine.kmp.api.Dump;
 import it.krzeminski.snakeyaml.engine.kmp.api.DumpSettings;
@@ -23,7 +25,7 @@
 @org.junit.jupiter.api.Tag("fast")
 public class BooleanJsonTest {
 
-  private final Load loader = new Load();
+  private final Load loader = new Load(LoadSettings.builder().setSchema(new JsonSchema()).build());
 
   @Test
   void parseBoolean() {
@@ -37,7 +39,7 @@ void parseBoolean() {
 
   @Test
   void dumpBoolean() {
-    Dump dumper = new Dump(DumpSettings.builder().build());
+    Dump dumper = new Dump(DumpSettings.builder().setSchema(new JsonSchema()).build());
     assertEquals("true\n", dumper.dumpToString(Boolean.TRUE));
     assertEquals("false\n", dumper.dumpToString(Boolean.FALSE));
   }

diff --git a/src/jvmTest/java/org/snakeyaml/engine/schema/NullCoreTest.java b/src/jvmTest/java/org/snakeyaml/engine/schema/NullCoreTest.java
@@ -16,17 +16,15 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import it.krzeminski.snakeyaml.engine.kmp.api.DumpSettings;
 import org.junit.jupiter.api.Test;
 import it.krzeminski.snakeyaml.engine.kmp.api.Dump;
-import it.krzeminski.snakeyaml.engine.kmp.api.DumpSettings;
 import it.krzeminski.snakeyaml.engine.kmp.api.Load;
-import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings;
-import it.krzeminski.snakeyaml.engine.kmp.schema.CoreSchema;
 
 @org.junit.jupiter.api.Tag("fast")
 public class NullCoreTest {
 
-  Load loader = new Load(LoadSettings.builder().setSchema(new CoreSchema()).build());
+  Load loader = new Load();
 
   @Test
   void parseNull() {
@@ -40,7 +38,7 @@ void parseNull() {
 
   @Test
   void dumpNull() {
-    Dump dumper = new Dump(DumpSettings.builder().setSchema(new CoreSchema()).build());
+    Dump dumper = new Dump(DumpSettings.builder().build());
     assertEquals("null\n", dumper.dumpToString(null));
   }
 }
diff --git a/src/jvmTest/java/org/snakeyaml/engine/schema/NullJsonTest.java b/src/jvmTest/java/org/snakeyaml/engine/schema/NullJsonTest.java
@@ -16,6 +16,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
+import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings;
+import it.krzeminski.snakeyaml.engine.kmp.schema.JsonSchema;
 import org.junit.jupiter.api.Test;
 import it.krzeminski.snakeyaml.engine.kmp.api.Dump;
 import it.krzeminski.snakeyaml.engine.kmp.api.DumpSettings;
@@ -24,7 +26,7 @@
 @org.junit.jupiter.api.Tag("fast")
 public class NullJsonTest {
 
-  private final Load loader = new Load();
+  private final Load loader = new Load(LoadSettings.builder().setSchema(new JsonSchema()).build());
 
   @Test
   void parseNull() {
@@ -34,7 +36,7 @@ void parseNull() {
 
   @Test
   void dumpNull() {
-    Dump dumper = new Dump(DumpSettings.builder().build());
+    Dump dumper = new Dump(DumpSettings.builder().setSchema(new JsonSchema()).build());
     assertEquals("null\n", dumper.dumpToString(null));
   }
 }
diff --git a/src/jvmTest/java/org/snakeyaml/engine/schema/NumberCoreTest.java b/src/jvmTest/java/org/snakeyaml/engine/schema/NumberCoreTest.java
@@ -16,18 +16,17 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigInteger;
+
+import it.krzeminski.snakeyaml.engine.kmp.api.DumpSettings;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import it.krzeminski.snakeyaml.engine.kmp.api.Dump;
-import it.krzeminski.snakeyaml.engine.kmp.api.DumpSettings;
 import it.krzeminski.snakeyaml.engine.kmp.api.Load;
-import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings;
-import it.krzeminski.snakeyaml.engine.kmp.schema.CoreSchema;
 
 @org.junit.jupiter.api.Tag("fast")
 public class NumberCoreTest {
 
-  Load loader = new Load(LoadSettings.builder().setSchema(new CoreSchema()).build());
+  Load loader = new Load();
 
   @Test
   @DisplayName("Test all integers which are defined in the core schema & JSON")
@@ -116,7 +115,7 @@ void parseDoubleSpecial() {
   @Test
   @DisplayName("Dump special doubles which are defined in the core schema")
   void dumpDoubleSpecial() {
-    Dump dumper = new Dump(DumpSettings.builder().setSchema(new CoreSchema()).build());
+    Dump dumper = new Dump(DumpSettings.builder().build());
     assertEquals(".inf\n", dumper.dumpToString(Double.POSITIVE_INFINITY));
     assertEquals(".inf\n", dumper.dumpToString(Float.POSITIVE_INFINITY));
 

diff --git a/src/jvmTest/java/org/snakeyaml/engine/schema/NumberJsonTest.java b/src/jvmTest/java/org/snakeyaml/engine/schema/NumberJsonTest.java
@@ -16,6 +16,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigInteger;
+
+import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings;
+import it.krzeminski.snakeyaml.engine.kmp.schema.JsonSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import it.krzeminski.snakeyaml.engine.kmp.api.Dump;
@@ -25,7 +28,7 @@
 @org.junit.jupiter.api.Tag("fast")
 public class NumberJsonTest {
 
-  private final Load loader = new Load();
+  private final Load loader = new Load(LoadSettings.builder().setSchema(new JsonSchema()).build());
 
   @Test
   @DisplayName("Test all integers which are define in the core schema & JSON")
@@ -100,7 +103,7 @@ void parseDoubleSpecial() {
   @Test
   @DisplayName("Dump special doubles which are defined in the JSON schema, but not in JSON")
   void dumpDoubleSpecial() {
-    Dump dumper = new Dump(DumpSettings.builder().build());
+    Dump dumper = new Dump(DumpSettings.builder().setSchema(new JsonSchema()).build());
     assertEquals(".inf\n", dumper.dumpToString(Double.POSITIVE_INFINITY));
     assertEquals(".inf\n", dumper.dumpToString(Float.POSITIVE_INFINITY));
 

diff --git a/src/jvmTest/java/org/snakeyaml/engine/v2/api/LoadSettingsTest.java b/src/jvmTest/java/org/snakeyaml/engine/v2/api/LoadSettingsTest.java
@@ -21,12 +21,12 @@
 
 import it.krzeminski.snakeyaml.engine.kmp.api.*;
 import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings;
+import it.krzeminski.snakeyaml.engine.kmp.schema.CoreSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import it.krzeminski.snakeyaml.engine.kmp.api.LoadSettings.SpecVersionMutator;
 import it.krzeminski.snakeyaml.engine.kmp.exceptions.DuplicateKeyException;
-import it.krzeminski.snakeyaml.engine.kmp.schema.JsonSchema;
 
 @Tag("fast")
 class LoadSettingsTest {
@@ -107,7 +107,7 @@ void bufferSize() {
   @DisplayName("Use JSON schema by default")
   void defaultSchema() {
     LoadSettings settings = LoadSettings.builder().build();
-    assertEquals(JsonSchema.class, settings.schema.getClass());
+    assertEquals(CoreSchema.class, settings.schema.getClass());
   }
 
   public enum SomeStatus implements SettingKey {