Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 855: use snakeyaml 1.6 constructor to avoid conflict w/testng-eclipse

This commit is contained in:
Adrian Cole 2012-03-07 09:51:33 -08:00
parent 72e3599a8b
commit 40429eaeca
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/ImagesToYamlImagesFromYamlDescriptor.java
View File

@ -30,6 +30,7 @@ import javax.inject.Singleton;
import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Image;
import org.jclouds.virtualbox.domain.YamlImage; import org.jclouds.virtualbox.domain.YamlImage;
import org.yaml.snakeyaml.Loader;
import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.constructor.Constructor;
@ -69,7 +70,9 @@ public class ImagesToYamlImagesFromYamlDescriptor implements Supplier<Map<Image,
imageDesc.putListPropertyType("images", String.class); imageDesc.putListPropertyType("images", String.class);
constructor.addTypeDescription(imageDesc); constructor.addTypeDescription(imageDesc);
Yaml yaml = new Yaml(constructor); // Issue 855: testng is rev-locking us to snakeyaml 1.6
// we have to use old constructor until this is fixed
Yaml yaml = new Yaml(new Loader(constructor));
Config config = (Config) yaml.load(yamlDescriptor); Config config = (Config) yaml.load(yamlDescriptor);
checkState(config != null, "missing config: class"); checkState(config != null, "missing config: class");
checkState(config.images != null, "missing images: collection"); checkState(config.images != null, "missing images: collection");