Replace outdated methods

dejvokep · Jul 4, 2024 · 7fb4009 · 7fb4009
1 parent 09f25a4
commit 7fb4009
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/src/main/java/dev/dejvokep/boostedyaml/settings/dumper/DumperSettings.java b/src/main/java/dev/dejvokep/boostedyaml/settings/dumper/DumperSettings.java
@@ -25,7 +25,7 @@
 import org.snakeyaml.engine.v2.common.ScalarStyle;
 import org.snakeyaml.engine.v2.common.SpecVersion;
 import org.snakeyaml.engine.v2.nodes.Tag;
-import org.snakeyaml.engine.v2.resolver.ScalarResolver;
+import org.snakeyaml.engine.v2.schema.Schema;
 import org.snakeyaml.engine.v2.serializer.AnchorGenerator;
 import org.snakeyaml.engine.v2.serializer.NumberAnchorGenerator;
 
@@ -384,23 +384,21 @@ public Builder setEndMarker(boolean endMarker) {
         }
 
         /**
-         * Sets a custom scalar resolver, used to resolve tags for objects.
+         * Sets custom schema to use. Schemas are used to resolve and determine object tags contained within a document.
          * <p>
-         * For additional information please refer to documentation of the parent method listed below.
+         * For additional information, please refer to documentation of the parent method listed below.
          * <p>
          * <b>Default: </b> defined by the parent method<br>
-         * <b>Parent method: </b> {@link DumpSettingsBuilder#setScalarResolver(ScalarResolver)}<br>
-         * <b>Parent method docs (v2.3): </b><a
-         * href="https://javadoc.io/static/org.snakeyaml/snakeyaml-engine/2.3/org/snakeyaml/engine/v2/api/DumpSettingsBuilder.html#setScalarResolver(org.snakeyaml.engine.v2.resolver.ScalarResolver)">click</a><br>
-         * <b>Related YAML spec (v1.2.2): </b><a href="https://yaml.org/spec/1.2.2/#1021-tags">JSON schema tags</a>, <a
-         * href="https://yaml.org/spec/1.2.2/#failsafe-schema">failsafe schema tags</a>
+         * <b>Parent method: </b> {@link DumpSettingsBuilder#setSchema(Schema)}<br>
+         * <b>Parent method docs (v2.7): </b><a href="https://javadoc.io/static/org.snakeyaml/snakeyaml-engine/2.7/org/snakeyaml/engine/v2/api/DumpSettingsBuilder.html#setSchema(org.snakeyaml.engine.v2.schema.Schema)">click</a><br>
+         * <b>Related YAML spec (v1.2.2): </b><a href="https://yaml.org/spec/1.2.2/#1021-tags">JSON schema tags</a>, <a href="https://yaml.org/spec/1.2.2/#failsafe-schema">failsafe schema tags</a>
          *
-         * @param resolver the resolver to set
+         * @param schema the schema to set
          * @return the builder
-         * @see DumpSettingsBuilder#setScalarResolver(ScalarResolver)
+         * @see DumpSettingsBuilder#setSchema(Schema)
          */
-        public Builder setScalarResolver(@NotNull ScalarResolver resolver) {
-            builder.setScalarResolver(resolver);
+        public Builder setSchema(@NotNull Schema schema) {
+            builder.setSchema(schema);
             return this;
         }
 

diff --git a/src/main/java/dev/dejvokep/boostedyaml/settings/loader/LoaderSettings.java b/src/main/java/dev/dejvokep/boostedyaml/settings/loader/LoaderSettings.java
@@ -17,9 +17,7 @@
 
 import dev.dejvokep.boostedyaml.YamlDocument;
 import dev.dejvokep.boostedyaml.settings.Settings;
-import dev.dejvokep.boostedyaml.settings.dumper.DumperSettings;
 import dev.dejvokep.boostedyaml.settings.general.GeneralSettings;
-import dev.dejvokep.boostedyaml.settings.updater.UpdaterSettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.snakeyaml.engine.v2.api.ConstructNode;
@@ -29,6 +27,7 @@
 import org.snakeyaml.engine.v2.env.EnvConfig;
 import org.snakeyaml.engine.v2.nodes.Tag;
 import org.snakeyaml.engine.v2.resolver.ScalarResolver;
+import org.snakeyaml.engine.v2.schema.Schema;
 
 import java.util.Map;
 import java.util.Optional;
@@ -301,21 +300,21 @@ public Builder setTagConstructors(@NotNull Map<Tag, ConstructNode> constructors)
         }
 
         /**
-         * Sets custom scalar resolver, used to resolve tags for objects.
+         * Sets custom schema to use. Schemas are used to resolve and determine object tags contained within a document.
          * <p>
          * For additional information, please refer to documentation of the parent method listed below.
          * <p>
          * <b>Default: </b> defined by the parent method<br>
-         * <b>Parent method: </b> {@link LoadSettingsBuilder#setScalarResolver(ScalarResolver)}<br>
-         * <b>Parent method docs (v2.3): </b><a href="https://javadoc.io/static/org.snakeyaml/snakeyaml-engine/2.3/org/snakeyaml/engine/v2/api/LoadSettingsBuilder.html#setScalarResolver(org.snakeyaml.engine.v2.resolver.ScalarResolver)">click</a><br>
+         * <b>Parent method: </b> {@link LoadSettingsBuilder#setSchema(Schema)}<br>
+         * <b>Parent method docs (v2.7): </b><a href="https://javadoc.io/static/org.snakeyaml/snakeyaml-engine/2.7/org/snakeyaml/engine/v2/api/LoadSettingsBuilder.html#setSchema(org.snakeyaml.engine.v2.schema.Schema)">click</a><br>
          * <b>Related YAML spec (v1.2.2): </b><a href="https://yaml.org/spec/1.2.2/#1021-tags">JSON schema tags</a>, <a href="https://yaml.org/spec/1.2.2/#failsafe-schema">failsafe schema tags</a>
          *
-         * @param resolver the resolver to set
+         * @param schema the schema to set
          * @return the builder
-         * @see DumpSettingsBuilder#setScalarResolver(ScalarResolver)
+         * @see LoadSettingsBuilder#setSchema(Schema)
          */
-        public Builder setScalarResolver(@NotNull ScalarResolver resolver) {
-            builder.setScalarResolver(resolver);
+        public Builder setSchema(@NotNull Schema schema) {
+            builder.setSchema(schema);
             return this;
         }
 
@@ -331,7 +330,7 @@ public Builder setScalarResolver(@NotNull ScalarResolver resolver) {
          *
          * @param envConfig the config to set
          * @return the builder
-         * @see DumpSettingsBuilder#setScalarResolver(ScalarResolver)
+         * @see LoadSettingsBuilder#setEnvConfig(Optional)
          */
         public Builder setEnvironmentConfig(@Nullable EnvConfig envConfig) {
             builder.setEnvConfig(Optional.ofNullable(envConfig));

diff --git a/src/test/java/dev/dejvokep/boostedyaml/settings/dumper/DumperSettingsTest.java b/src/test/java/dev/dejvokep/boostedyaml/settings/dumper/DumperSettingsTest.java
@@ -24,6 +24,8 @@
 import org.snakeyaml.engine.v2.nodes.Tag;
 import org.snakeyaml.engine.v2.resolver.JsonScalarResolver;
 import org.snakeyaml.engine.v2.resolver.ScalarResolver;
+import org.snakeyaml.engine.v2.schema.JsonSchema;
+import org.snakeyaml.engine.v2.schema.Schema;
 import org.snakeyaml.engine.v2.serializer.AnchorGenerator;
 import org.snakeyaml.engine.v2.serializer.NumberAnchorGenerator;
 
@@ -71,8 +73,8 @@ void buildEngineSettings() {
         assertEquals(ScalarStyle.SINGLE_QUOTED, DumperSettings.builder().setStringStyle(ScalarStyle.SINGLE_QUOTED).build().getStringStyle());
         assertEquals(ScalarStyle.FOLDED, DumperSettings.builder().setStringStyle(ScalarStyle.FOLDED).build().getStringStyle());
         // Scalar resolver
-        ScalarResolver scalarResolver = new JsonScalarResolver();
-        assertEquals(scalarResolver, DumperSettings.builder().setScalarResolver(scalarResolver).build().buildEngineSettings().getScalarResolver());
+        Schema schema = new JsonSchema();
+        assertEquals(schema, DumperSettings.builder().setSchema(schema).build().buildEngineSettings().getSchema());
         // Line break
         assertEquals("\r\n", DumperSettings.builder().setLineBreak("\r\n").build().buildEngineSettings().getBestLineBreak());
         // Indentation