forked from pool/manifold
76 lines
4.0 KiB
Diff
76 lines
4.0 KiB
Diff
diff -up manifold-2022.1.5/manifold-deps-parent/manifold-yaml-rt/src/main/java/manifold/api/yaml/rt/parser/YamlParser.java.p00 manifold-2022.1.5/manifold-deps-parent/manifold-yaml-rt/src/main/java/manifold/api/yaml/rt/parser/YamlParser.java
|
|
--- manifold-2022.1.5/manifold-deps-parent/manifold-yaml-rt/src/main/java/manifold/api/yaml/rt/parser/YamlParser.java.p00 2023-04-14 05:16:27.835327125 +0300
|
|
+++ manifold-2022.1.5/manifold-deps-parent/manifold-yaml-rt/src/main/java/manifold/api/yaml/rt/parser/YamlParser.java 2023-04-14 05:35:31.954314211 +0300
|
|
@@ -23,16 +23,16 @@ import manifold.json.rt.parser.Token;
|
|
import manifold.json.rt.parser.TokenType;
|
|
import manifold.rt.api.util.Pair;
|
|
import manifold.util.ReflectUtil;
|
|
-import org.snakeyaml.engine.v1.api.Load;
|
|
-import org.snakeyaml.engine.v1.api.LoadSettings;
|
|
-import org.snakeyaml.engine.v1.api.LoadSettingsBuilder;
|
|
-import org.snakeyaml.engine.v1.constructor.BaseConstructor;
|
|
-import org.snakeyaml.engine.v1.constructor.StandardConstructor;
|
|
-import org.snakeyaml.engine.v1.exceptions.ConstructorException;
|
|
-import org.snakeyaml.engine.v1.exceptions.Mark;
|
|
-import org.snakeyaml.engine.v1.nodes.MappingNode;
|
|
-import org.snakeyaml.engine.v1.nodes.Node;
|
|
-import org.snakeyaml.engine.v1.nodes.NodeTuple;
|
|
+import org.snakeyaml.engine.v2.api.Load;
|
|
+import org.snakeyaml.engine.v2.api.LoadSettings;
|
|
+import org.snakeyaml.engine.v2.api.LoadSettingsBuilder;
|
|
+import org.snakeyaml.engine.v2.constructor.BaseConstructor;
|
|
+import org.snakeyaml.engine.v2.constructor.StandardConstructor;
|
|
+import org.snakeyaml.engine.v2.exceptions.ConstructorException;
|
|
+import org.snakeyaml.engine.v2.exceptions.Mark;
|
|
+import org.snakeyaml.engine.v2.nodes.MappingNode;
|
|
+import org.snakeyaml.engine.v2.nodes.Node;
|
|
+import org.snakeyaml.engine.v2.nodes.NodeTuple;
|
|
|
|
/**
|
|
* Parses YAML formatted text using snakeyaml
|
|
@@ -41,9 +41,9 @@ public class YamlParser
|
|
{
|
|
public static Object parseYaml( String yaml, boolean withTokens )
|
|
{
|
|
- LoadSettings loadSettings = new LoadSettingsBuilder()
|
|
+ LoadSettings loadSettings = LoadSettings.builder()
|
|
.setUseMarks( true )
|
|
- .setDefaultMap( DataBindings::new )
|
|
+ .setDefaultMap( map->(Map)new DataBindings(map) )
|
|
.build();
|
|
Load load = new Load( loadSettings, new MyConstructor( loadSettings, withTokens ) );
|
|
return load.loadFromString( yaml );
|
|
diff -up manifold-2022.1.5/manifold-deps-parent/manifold-yaml-rt/src/main/java/manifold/api/yaml/rt/Yaml.java.p00 manifold-2022.1.5/manifold-deps-parent/manifold-yaml-rt/src/main/java/manifold/api/yaml/rt/Yaml.java
|
|
--- manifold-2022.1.5/manifold-deps-parent/manifold-yaml-rt/src/main/java/manifold/api/yaml/rt/Yaml.java.p00 2023-04-14 05:09:30.681843836 +0300
|
|
+++ manifold-2022.1.5/manifold-deps-parent/manifold-yaml-rt/src/main/java/manifold/api/yaml/rt/Yaml.java 2023-04-14 05:35:54.586609696 +0300
|
|
@@ -18,13 +18,13 @@ package manifold.api.yaml.rt;
|
|
|
|
import manifold.rt.api.ScriptException;
|
|
import manifold.api.yaml.rt.parser.YamlParser;
|
|
-import org.snakeyaml.engine.v1.api.Dump;
|
|
-import org.snakeyaml.engine.v1.api.DumpSettings;
|
|
-import org.snakeyaml.engine.v1.api.DumpSettingsBuilder;
|
|
-import org.snakeyaml.engine.v1.api.StreamDataWriter;
|
|
-import org.snakeyaml.engine.v1.common.FlowStyle;
|
|
-import org.snakeyaml.engine.v1.exceptions.Mark;
|
|
-import org.snakeyaml.engine.v1.exceptions.MarkedYamlEngineException;
|
|
+import org.snakeyaml.engine.v2.api.Dump;
|
|
+import org.snakeyaml.engine.v2.api.DumpSettings;
|
|
+import org.snakeyaml.engine.v2.api.DumpSettingsBuilder;
|
|
+import org.snakeyaml.engine.v2.api.StreamDataWriter;
|
|
+import org.snakeyaml.engine.v2.common.FlowStyle;
|
|
+import org.snakeyaml.engine.v2.exceptions.Mark;
|
|
+import org.snakeyaml.engine.v2.exceptions.MarkedYamlEngineException;
|
|
|
|
public class Yaml
|
|
{
|
|
@@ -64,7 +64,7 @@ public class Yaml
|
|
*/
|
|
public static void toYaml( Object jsonValue, StringBuilder target )
|
|
{
|
|
- DumpSettings settings = new DumpSettingsBuilder()
|
|
+ DumpSettings settings = DumpSettings.builder()
|
|
.setBestLineBreak( "\n" )
|
|
.setMultiLineFlow( true )
|
|
.setDefaultFlowStyle( FlowStyle.BLOCK )
|