commit f82e94c3374d7ced6d5a6a7d0238fe85a954ac3d
author Andrew Gaul <gaul@apache.org> Sun Apr 16 16:27:38 2023 +0900
committer Andrew Gaul <andrew@gaul.org> Sun Apr 16 16:43:36 2023 +0900
tree f8cf777e7119f7c710a0f5f23a100c1524a52cde
parent 788f75f9379287e70a2e2197297cb0efd45f96f7

Upgrade to snakeyaml 2.0

This has some API changes.  Closes #169.

apis/byon/pom.xml

diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml
index 2f8a372..17b2183 100644
--- a/apis/byon/pom.xml
+++ b/apis/byon/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
-      <version>1.32</version>
+      <version>2.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.auto.service</groupId>

apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java

diff --git a/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java b/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java
index 8cbbdc0..5914dd6 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java
@@ -25,6 +25,7 @@
 import org.jclouds.byon.Node;
 import org.jclouds.util.Closeables2;
 import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
@@ -111,7 +112,7 @@
          InputStream in = null;
          try {
             in = byteSource.openStream();
-            return (YamlNode) new Yaml(new Constructor(YamlNode.class)).load(in);
+            return (YamlNode) new Yaml(new Constructor(YamlNode.class, new LoaderOptions())).load(in);
          } catch (IOException ioe) {
             throw Throwables.propagate(ioe);
          } finally {

apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java

diff --git a/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java b/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java
index 18454e1..4176b87 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYamlStream.java
@@ -29,6 +29,7 @@
 
 import org.jclouds.byon.Node;
 import org.jclouds.byon.domain.YamlNode;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
@@ -80,7 +81,7 @@
    @Override
    public LoadingCache<String, Node> apply(ByteSource source) {
 
-      Constructor constructor = new Constructor(Config.class);
+      Constructor constructor = new Constructor(Config.class, new LoaderOptions());
 
       TypeDescription nodeDesc = new TypeDescription(YamlNode.class);
       nodeDesc.putListPropertyType("tags", String.class);