Repository: jclouds Updated Branches: refs/heads/master e7bf9b129 -> 0616b865e
[JCLOUDS-1147] upgrade snakeyaml version in byon and resolve removed deprecated Loader class Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0616b865 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0616b865 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0616b865 Branch: refs/heads/master Commit: 0616b865edcf9d082a95000cd3834fc0a6893b81 Parents: e7bf9b1 Author: Josef Cacek <[email protected]> Authored: Tue Aug 2 14:37:56 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Tue Aug 2 15:28:41 2016 +0200 ---------------------------------------------------------------------- apis/byon/pom.xml | 2 +- apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java | 5 +---- .../java/org/jclouds/byon/functions/NodesFromYamlStream.java | 6 +----- 3 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/0616b865/apis/byon/pom.xml ---------------------------------------------------------------------- diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml index 6a46eb1..023d77b 100644 --- a/apis/byon/pom.xml +++ b/apis/byon/pom.xml @@ -73,7 +73,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.11</version> + <version>1.17</version> </dependency> <dependency> <groupId>com.google.auto.service</groupId> http://git-wip-us.apache.org/repos/asf/jclouds/blob/0616b865/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 65aa991..8cbbdc0 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,7 +25,6 @@ import java.util.Map; import org.jclouds.byon.Node; import org.jclouds.util.Closeables2; import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Loader; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; @@ -109,12 +108,10 @@ public class YamlNode { public YamlNode apply(ByteSource byteSource) { if (byteSource == null) return null; - // note that snakeyaml also throws nosuchmethod error when you use the non-deprecated - // constructor InputStream in = null; try { in = byteSource.openStream(); - return (YamlNode) new Yaml(new Loader(new Constructor(YamlNode.class))).load(in); + return (YamlNode) new Yaml(new Constructor(YamlNode.class)).load(in); } catch (IOException ioe) { throw Throwables.propagate(ioe); } finally { http://git-wip-us.apache.org/repos/asf/jclouds/blob/0616b865/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 45a931f..18454e1 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,7 +29,6 @@ import javax.inject.Singleton; import org.jclouds.byon.Node; import org.jclouds.byon.domain.YamlNode; -import org.yaml.snakeyaml.Loader; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; @@ -90,10 +89,7 @@ public class NodesFromYamlStream implements Function<ByteSource, LoadingCache<St TypeDescription configDesc = new TypeDescription(Config.class); configDesc.putListPropertyType("nodes", YamlNode.class); constructor.addTypeDescription(configDesc); - // note that snakeyaml also throws nosuchmethod error when you use the - // non-deprecated - // constructor - Yaml yaml = new Yaml(new Loader(constructor)); + Yaml yaml = new Yaml(constructor); Config config; InputStream in = null; try {
