Issue 124: add one more Yaml.dumpAs() method and get rid of its side effects
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bad3c5d..c52d470 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -7,11 +7,11 @@
</properties>
<body>
<release version="1.9-SNAPSHOT" date="in Mercurial" description="Development">
- <action dev="py4fun" type="add" issue="124">
+ <action dev="py4fun" type="remove" issue="124">
Deprecate DumperOptions.explicitRoot (2011-07-20)
</action>
<action dev="py4fun" type="add" issue="124">
- Add Yaml.dumpAs(Object, Tag.MAP) method. JavaBeanDumper is marked as deprecated (2011-07-16)
+ Add Yaml.dumpAs(Object, Tag.MAP, FlowStyle) and Yaml.dumpAs(Object) methods. JavaBeanDumper is marked as deprecated (2011-07-16)
</action>
<action dev="py4fun" type="add" issue="127">
Add example to show how to dump a custom class (2011-07-12)
diff --git a/src/main/java/org/yaml/snakeyaml/DumperOptions.java b/src/main/java/org/yaml/snakeyaml/DumperOptions.java
index 733931e..535e0f9 100644
--- a/src/main/java/org/yaml/snakeyaml/DumperOptions.java
+++ b/src/main/java/org/yaml/snakeyaml/DumperOptions.java
@@ -76,7 +76,7 @@
* document. In contrast, flow styles rely on explicit indicators to denote
* nesting and scope.
*
- * @see 3.2.3.1. Node Styles (http://yaml.org/spec/1.1)
+ * @see See Chapter 10. Collection Styles http://yaml.org/spec/1.1/#id930798
*/
public enum FlowStyle {
FLOW(Boolean.TRUE), BLOCK(Boolean.FALSE), AUTO(null);
diff --git a/src/main/java/org/yaml/snakeyaml/Yaml.java b/src/main/java/org/yaml/snakeyaml/Yaml.java
index b415b43..bf616fa 100644
--- a/src/main/java/org/yaml/snakeyaml/Yaml.java
+++ b/src/main/java/org/yaml/snakeyaml/Yaml.java
@@ -307,22 +307,47 @@
* the tag for the whole YAML document. The tag should be Tag.MAP
* for a JavaBean to make the tag disappear (to use implicit tag
* !!map)
- *
- * @see Yaml.loadAs(String, Tag)
- * @see Tag
+ * @param flowStyle
+ * flow style for the whole document. See Chapter 10. Collection
+ * Styles http://yaml.org/spec/1.1/#id930798
*
* @return YAML String
*/
- public String dumpAs(Object data, Tag rootTag) {
- representer.setDefaultFlowStyle(FlowStyle.BLOCK);
+ public String dumpAs(Object data, Tag rootTag, FlowStyle flowStyle) {
+ FlowStyle oldStyle = representer.getDefaultFlowStyle();
+ representer.setDefaultFlowStyle(flowStyle);
List<Object> list = new ArrayList<Object>(1);
list.add(data);
StringWriter buffer = new StringWriter();
dumpAll(list.iterator(), buffer, rootTag);
+ representer.setDefaultFlowStyle(oldStyle);
return buffer.toString();
}
/**
+ * <p>
+ * Serialize a Java object into a YAML string. Override the default root tag
+ * with <code>Tag.MAP</code>.
+ * </p>
+ * <p>
+ * This method is similar to <code>Yaml.dump(data)</code> except that the
+ * root tag for the whole document is replaced with <code>Tag.MAP</code> tag
+ * (implicit !!map).
+ * </p>
+ * <p>
+ * Block Mapping is used as the collection style. See 10.2.2. Block Mappings
+ * (http://yaml.org/spec/1.1/#id934537)
+ * </p>
+ *
+ * @param data
+ * Java object to be serialized to YAML
+ * @return YAML String
+ */
+ public String dumpAs(Object data) {
+ return dumpAs(data, Tag.MAP, FlowStyle.BLOCK);
+ }
+
+ /**
* Serialize the representation tree into Events.
*
* @see http://yaml.org/spec/1.1/#id859333
diff --git a/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java b/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java
index 89c32fa..e977859 100644
--- a/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java
+++ b/src/main/java/org/yaml/snakeyaml/representer/BaseRepresenter.java
@@ -49,7 +49,7 @@
// the order is important (map can be also a sequence of key-values)
protected final Map<Class<?>, Represent> multiRepresenters = new LinkedHashMap<Class<?>, Represent>();
private Character defaultStyle;
- protected Boolean defaultFlowStyle;
+ protected FlowStyle defaultFlowStyle = FlowStyle.AUTO;
protected final Map<Object, Node> representedObjects = new IdentityHashMap<Object, Node>() {
private static final long serialVersionUID = -5576159264232131854L;
@@ -143,8 +143,8 @@
value.add(nodeItem);
}
if (flowStyle == null) {
- if (defaultFlowStyle != null) {
- node.setFlowStyle(defaultFlowStyle);
+ if (defaultFlowStyle != FlowStyle.AUTO) {
+ node.setFlowStyle(defaultFlowStyle.getStyleBoolean());
} else {
node.setFlowStyle(bestStyle);
}
@@ -171,8 +171,8 @@
value.add(new NodeTuple(nodeKey, nodeValue));
}
if (flowStyle == null) {
- if (defaultFlowStyle != null) {
- node.setFlowStyle(defaultFlowStyle);
+ if (defaultFlowStyle != FlowStyle.AUTO) {
+ node.setFlowStyle(defaultFlowStyle.getStyleBoolean());
} else {
node.setFlowStyle(bestStyle);
}
@@ -185,7 +185,11 @@
}
public void setDefaultFlowStyle(FlowStyle defaultFlowStyle) {
- this.defaultFlowStyle = defaultFlowStyle.getStyleBoolean();
+ this.defaultFlowStyle = defaultFlowStyle;
+ }
+
+ public FlowStyle getDefaultFlowStyle() {
+ return this.defaultFlowStyle;
}
public void setPropertyUtils(PropertyUtils propertyUtils) {
diff --git a/src/main/java/org/yaml/snakeyaml/representer/Representer.java b/src/main/java/org/yaml/snakeyaml/representer/Representer.java
index 93fffc0..c0dc6b2 100644
--- a/src/main/java/org/yaml/snakeyaml/representer/Representer.java
+++ b/src/main/java/org/yaml/snakeyaml/representer/Representer.java
@@ -24,6 +24,7 @@
import java.util.Map;
import java.util.Set;
+import org.yaml.snakeyaml.DumperOptions.FlowStyle;
import org.yaml.snakeyaml.error.YAMLException;
import org.yaml.snakeyaml.introspector.Property;
import org.yaml.snakeyaml.nodes.MappingNode;
@@ -94,8 +95,8 @@
}
value.add(tuple);
}
- if (defaultFlowStyle != null) {
- node.setFlowStyle(defaultFlowStyle);
+ if (defaultFlowStyle != FlowStyle.AUTO) {
+ node.setFlowStyle(defaultFlowStyle.getStyleBoolean());
} else {
node.setFlowStyle(bestStyle);
}
diff --git a/src/test/java/examples/collections/ListFileldBeanTest.java b/src/test/java/examples/collections/ListFileldBeanTest.java
index 2ee6ad5..a9697ac 100644
--- a/src/test/java/examples/collections/ListFileldBeanTest.java
+++ b/src/test/java/examples/collections/ListFileldBeanTest.java
@@ -23,7 +23,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
/**
* Test public field ListBean->List<Developer> developers <br/>
@@ -42,7 +41,7 @@
bean.developers = developers;
bean.setName("Bean123");
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/list-bean-1.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/examples/collections/TypeSafeListNoGerericsTest.java b/src/test/java/examples/collections/TypeSafeListNoGerericsTest.java
index 1545b96..7ca2541 100644
--- a/src/test/java/examples/collections/TypeSafeListNoGerericsTest.java
+++ b/src/test/java/examples/collections/TypeSafeListNoGerericsTest.java
@@ -24,7 +24,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
/**
* Test ListBean->List developers <br/>
@@ -42,7 +41,7 @@
developers.add(new Developer("John", "committer"));
bean.setDevelopers(developers);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/list-bean-4.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/examples/collections/TypeSafeListTest.java b/src/test/java/examples/collections/TypeSafeListTest.java
index 4073291..463036f 100644
--- a/src/test/java/examples/collections/TypeSafeListTest.java
+++ b/src/test/java/examples/collections/TypeSafeListTest.java
@@ -23,7 +23,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
/**
* Test ListBean->List<Developer> developers <br/>
@@ -41,7 +40,7 @@
developers.add(new Developer("John", "committer"));
bean.setDevelopers(developers);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/list-bean-1.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/examples/collections/TypeSafeListWithInterfaceTest.java b/src/test/java/examples/collections/TypeSafeListWithInterfaceTest.java
index b7c3e43..b4bde40 100644
--- a/src/test/java/examples/collections/TypeSafeListWithInterfaceTest.java
+++ b/src/test/java/examples/collections/TypeSafeListWithInterfaceTest.java
@@ -23,7 +23,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
/**
* Test ListBean->List<Human> developers <br/>
@@ -41,7 +40,7 @@
developers.add(new Committer("John", "committer", 34));
bean.setDevelopers(developers);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/list-bean-2.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/examples/collections/TypeSafeMap2Test.java b/src/test/java/examples/collections/TypeSafeMap2Test.java
index e2d0fb0..efc8e1f 100644
--- a/src/test/java/examples/collections/TypeSafeMap2Test.java
+++ b/src/test/java/examples/collections/TypeSafeMap2Test.java
@@ -24,7 +24,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
/**
* Test MapBean->Map<Enum, Developer> developers <br/>
@@ -42,7 +41,7 @@
developers.put(Color.BLACK, new Developer2("John", "committer"));
bean.setDevelopers(developers);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/map-bean-12.yaml");
assertEquals(etalon, output);
@@ -61,7 +60,7 @@
developers.put(Color.BLACK, new Developer2("John", "committer"));
bean.setDevelopers(developers);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/map-bean-13.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/examples/collections/TypeSafeMapImplementationsTest.java b/src/test/java/examples/collections/TypeSafeMapImplementationsTest.java
index 97b2083..389064b 100644
--- a/src/test/java/examples/collections/TypeSafeMapImplementationsTest.java
+++ b/src/test/java/examples/collections/TypeSafeMapImplementationsTest.java
@@ -27,7 +27,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
/**
* Test different Map implementations as JavaBean properties
@@ -44,7 +43,7 @@
props.setProperty("key2", "value2");
bean.setProperties(props);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/map-bean-1.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/examples/collections/TypeSafeMapTest.java b/src/test/java/examples/collections/TypeSafeMapTest.java
index 8caaf42..f6829dc 100644
--- a/src/test/java/examples/collections/TypeSafeMapTest.java
+++ b/src/test/java/examples/collections/TypeSafeMapTest.java
@@ -23,7 +23,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
/**
* Test MapBean->Map<String, Developer> developers <br/>
@@ -42,7 +41,7 @@
developers.put("team2", new Developer2("John", "committer"));
bean.setDevelopers(developers);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/map-bean-10.yaml");
assertEquals(etalon, output);
@@ -60,7 +59,7 @@
developers.put("team3", new Developer222("Bill", "head"));
bean.setDevelopers(developers);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/map-bean-11.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/examples/collections/TypeSafeSetImplementationsTest.java b/src/test/java/examples/collections/TypeSafeSetImplementationsTest.java
index 873e70b..86960b2 100644
--- a/src/test/java/examples/collections/TypeSafeSetImplementationsTest.java
+++ b/src/test/java/examples/collections/TypeSafeSetImplementationsTest.java
@@ -26,7 +26,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
/**
* Test different Map implementations as JavaBean properties
@@ -44,7 +43,7 @@
developers.add(new Developer("Karl", "user"));
bean.setDevelopers(developers);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/set-bean-1.yaml");
assertEquals(etalon, output);
@@ -63,7 +62,7 @@
developers.add(new SuperDeveloper("Bill", "super"));
bean.setDevelopers(developers);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
String etalon = Util.getLocalResource("examples/set-bean-6.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/examples/staticstate/StaticFieldsWrapperTest.java b/src/test/java/examples/staticstate/StaticFieldsWrapperTest.java
index 41b8cf1..3d9c791 100644
--- a/src/test/java/examples/staticstate/StaticFieldsWrapperTest.java
+++ b/src/test/java/examples/staticstate/StaticFieldsWrapperTest.java
@@ -87,7 +87,7 @@
JavaBeanWithStaticState.setType("Type3");
JavaBeanWithStaticState.color = "Violet";
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(new Wrapper(bean), Tag.MAP);
+ String output = yaml.dumpAs(new Wrapper(bean));
// System.out.println(output);
assertEquals("age: -47\ncolor: Violet\nname: Bahrack\ntype: Type3\n", output);
// parse back to instance
diff --git a/src/test/java/org/yaml/snakeyaml/JavaBeanLoaderTest.java b/src/test/java/org/yaml/snakeyaml/JavaBeanLoaderTest.java
index e83b68b..e307b0d 100644
--- a/src/test/java/org/yaml/snakeyaml/JavaBeanLoaderTest.java
+++ b/src/test/java/org/yaml/snakeyaml/JavaBeanLoaderTest.java
@@ -27,7 +27,6 @@
import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.introspector.BeanAccess;
-import org.yaml.snakeyaml.nodes.Tag;
public class JavaBeanLoaderTest extends TestCase {
@@ -167,7 +166,7 @@
bean.setName("Test me.");
bean3.setBean(bean);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean3, Tag.MAP);
+ String output = yaml.dumpAs(bean3);
assertEquals("bean:\n id: 3\n name: Test me.\nlist: null\nname: Name123\n", output);
TypeDescription td = new TypeDescription(Bean3.class);
td.putListPropertyType("list", Integer.class);
@@ -188,7 +187,7 @@
list.add(17);
bean3.setList(list);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean3, Tag.MAP);
+ String output = yaml.dumpAs(bean3);
assertEquals("bean:\n id: 3\n name: Test me.\nlist:\n- 13\n- 17\nname: Name123\n", output);
TypeDescription td = new TypeDescription(Bean3.class);
td.putListPropertyType("list", Integer.class);
@@ -207,7 +206,7 @@
bean.setName("Test me.");
bean3.setBean(bean);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean3, Tag.MAP);
+ String output = yaml.dumpAs(bean3);
assertEquals("bean:\n id: 3\n name: Test me.\nlist: null\nname: Name123\n", output);
TypeDescription td = new TypeDescription(Bean2.class);
Yaml loader = new Yaml(new Constructor(td));
diff --git a/src/test/java/org/yaml/snakeyaml/JavaBeanTimeStampTest.java b/src/test/java/org/yaml/snakeyaml/JavaBeanTimeStampTest.java
index 47288fb..173669a 100644
--- a/src/test/java/org/yaml/snakeyaml/JavaBeanTimeStampTest.java
+++ b/src/test/java/org/yaml/snakeyaml/JavaBeanTimeStampTest.java
@@ -22,7 +22,6 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.DumperOptions.FlowStyle;
-import org.yaml.snakeyaml.nodes.Tag;
public class JavaBeanTimeStampTest extends TestCase {
public void testLoadDefaultJavaSqlTimestamp() throws Exception {
@@ -52,7 +51,7 @@
Date date = new Date(1001376000000L);
javaBeanToDump.setDate(date);
Yaml yaml = new Yaml();
- String dumpStr = yaml.dumpAs(javaBeanToDump, Tag.MAP);
+ String dumpStr = yaml.dumpAs(javaBeanToDump);
assertEquals("date: 2001-09-25T00:00:00Z\ntimestamp: 2001-09-09T01:46:40Z\n", dumpStr);
Yaml loader = new Yaml();
JavaBeanWithSqlTimestamp javaBeanToLoad = loader.loadAs(dumpStr,
diff --git a/src/test/java/org/yaml/snakeyaml/JavaBeanWithNullValuesTest.java b/src/test/java/org/yaml/snakeyaml/JavaBeanWithNullValuesTest.java
index 7edcab0..c18f436 100644
--- a/src/test/java/org/yaml/snakeyaml/JavaBeanWithNullValuesTest.java
+++ b/src/test/java/org/yaml/snakeyaml/JavaBeanWithNullValuesTest.java
@@ -113,7 +113,7 @@
javaBeanWithNullValues.setString(null); // ok
javaBeanWithNullValues.setTimestamp(new Timestamp(System.currentTimeMillis()));
- String dumpStr = yaml.dumpAs(javaBeanWithNullValues, Tag.MAP);
+ String dumpStr = yaml.dumpAs(javaBeanWithNullValues);
// System.out.println(dumpStr);
assertFalse("No explicit root tag must be used.",
dumpStr.contains("JavaBeanWithNullValues"));
diff --git a/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java b/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java
index 16cda4f..4be923c 100644
--- a/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java
+++ b/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
+import org.yaml.snakeyaml.DumperOptions.FlowStyle;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
@@ -59,12 +60,12 @@
map.put("id", 3);
car1.setMap(map);
car1.setYear("2008");
- String carYaml1 = new Yaml().dumpAs(car1, Tag.MAP);
+ String carYaml1 = new Yaml().dumpAs(car1, Tag.MAP, FlowStyle.AUTO);
assertEquals(Util.getLocalResource("constructor/car-without-root-tag.yaml"), carYaml1);
//
Constructor contructor = new Constructor(CarWithWheel.class);
CarWithWheel car2 = (CarWithWheel) new Yaml(contructor).load(carYaml1);
- String carYaml2 = new Yaml().dumpAs(car2, Tag.MAP);
+ String carYaml2 = new Yaml().dumpAs(car2, Tag.MAP, FlowStyle.AUTO);
assertEquals(carYaml1, carYaml2);
}
diff --git a/src/test/java/org/yaml/snakeyaml/emitter/template/VelocityTest.java b/src/test/java/org/yaml/snakeyaml/emitter/template/VelocityTest.java
index f0c3d77..5eed8cf 100644
--- a/src/test/java/org/yaml/snakeyaml/emitter/template/VelocityTest.java
+++ b/src/test/java/org/yaml/snakeyaml/emitter/template/VelocityTest.java
@@ -30,14 +30,13 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.immutable.Point;
-import org.yaml.snakeyaml.nodes.Tag;
public class VelocityTest extends TestCase {
public void testNoTemplate() {
DumperOptions options = new DumperOptions();
options.setAllowReadOnlyProperties(true);
Yaml yaml = new Yaml(options);
- String output = yaml.dumpAs(createBean(), Tag.MAP);
+ String output = yaml.dumpAs(createBean());
// System.out.println(output);
assertEquals(Util.getLocalResource("template/etalon1.yaml"), output);
}
diff --git a/src/test/java/org/yaml/snakeyaml/generics/BirdTest.java b/src/test/java/org/yaml/snakeyaml/generics/BirdTest.java
index 4973ab6..df321c6 100644
--- a/src/test/java/org/yaml/snakeyaml/generics/BirdTest.java
+++ b/src/test/java/org/yaml/snakeyaml/generics/BirdTest.java
@@ -21,7 +21,6 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class BirdTest extends TestCase {
@@ -33,7 +32,7 @@
home.setHeight(3);
bird.setHome(home);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bird, Tag.MAP);
+ String output = yaml.dumpAs(bird);
Bird parsed;
String javaVendor = System.getProperty("java.vm.name");
Yaml loader = new Yaml();
diff --git a/src/test/java/org/yaml/snakeyaml/generics/GenericArrayTypeTest.java b/src/test/java/org/yaml/snakeyaml/generics/GenericArrayTypeTest.java
index 374635c..63fdd1f 100644
--- a/src/test/java/org/yaml/snakeyaml/generics/GenericArrayTypeTest.java
+++ b/src/test/java/org/yaml/snakeyaml/generics/GenericArrayTypeTest.java
@@ -22,7 +22,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class GenericArrayTypeTest extends TestCase {
@@ -109,7 +108,7 @@
bean.setId("ID556677");
bean.setGa(ga);
Yaml dumper = new Yaml();
- String doc = dumper.dumpAs(bean, Tag.MAP);
+ String doc = dumper.dumpAs(bean);
// System.out.println(doc);
assertEquals(Util.getLocalResource("javabeans/genericArray-1.yaml"), doc);
//
diff --git a/src/test/java/org/yaml/snakeyaml/generics/ObjectValuesTest.java b/src/test/java/org/yaml/snakeyaml/generics/ObjectValuesTest.java
index 23b599f..176671b 100644
--- a/src/test/java/org/yaml/snakeyaml/generics/ObjectValuesTest.java
+++ b/src/test/java/org/yaml/snakeyaml/generics/ObjectValuesTest.java
@@ -24,7 +24,6 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class ObjectValuesTest extends TestCase {
@@ -47,7 +46,7 @@
ov.setPossible(props);
Yaml dumper = new Yaml();
- String dumpedStr = dumper.dumpAs(ov, Tag.MAP);
+ String dumpedStr = dumper.dumpAs(ov);
Yaml loader = new Yaml();
ObjectValues ov2 = loader.loadAs(dumpedStr, ObjectValues.class);
@@ -77,7 +76,7 @@
ov.setPossible(props);
Yaml dumper = new Yaml();
- String dumpedStr = dumper.dumpAs(ov, Tag.MAP);
+ String dumpedStr = dumper.dumpAs(ov);
Yaml loader = new Yaml();
ObjectValuesWithParam<String, Integer> ov2 = loader.loadAs(dumpedStr,
new ObjectValuesWithParam<String, Integer>().getClass());
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue10/BasicDumpTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue10/BasicDumpTest.java
index b035c7d..bf0a567 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue10/BasicDumpTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue10/BasicDumpTest.java
@@ -23,7 +23,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class BasicDumpTest extends TestCase {
@@ -65,7 +64,7 @@
ds.setDataSources(dataSources);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(ds, Tag.MAP);
+ String output = yaml.dumpAs(ds);
String etalon = Util.getLocalResource("javabeans/issue10-2.yaml");
assertEquals(etalon.trim(), output.trim());
@@ -87,7 +86,7 @@
ds.setDataSources(dataSources);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(ds, Tag.MAP);
+ String output = yaml.dumpAs(ds);
String etalon = Util.getLocalResource("javabeans/issue10-3.yaml");
assertEquals(etalon.trim(), output.trim());
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue102/BigDataLoadTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue102/BigDataLoadTest.java
index 4693072..11976ca 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue102/BigDataLoadTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue102/BigDataLoadTest.java
@@ -25,7 +25,6 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class BigDataLoadTest extends TestCase {
private static final int SIZE = 5000;
@@ -61,7 +60,7 @@
bean.setList(list);
bean.setMap(map);
beans.add(bean);
- String ooo = yaml.dumpAs(bean, Tag.MAP);
+ String ooo = yaml.dumpAs(bean);
String[] lines = ooo.split("\n");
builder.append("-\n");
for (int j = 0; j < lines.length; j++) {
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue112/ParameterisedTypeLoadingTestCase.java b/src/test/java/org/yaml/snakeyaml/issues/issue112/ParameterisedTypeLoadingTestCase.java
index c6bb1db..ff73452 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue112/ParameterisedTypeLoadingTestCase.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue112/ParameterisedTypeLoadingTestCase.java
@@ -26,7 +26,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.nodes.Tag;
public class ParameterisedTypeLoadingTestCase {
@@ -38,7 +37,7 @@
// dump the object
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(obj, Tag.MAP);
+ String output = yaml.dumpAs(obj);
assertEquals(Util.getLocalResource("issues/issue112-2.yaml"), output);
}
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue124/DumpSideEffectsTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue124/DumpSideEffectsTest.java
index d2a366f..5891a26 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue124/DumpSideEffectsTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue124/DumpSideEffectsTest.java
@@ -18,7 +18,6 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class DumpSideEffectsTest extends TestCase {
@@ -30,7 +29,7 @@
String output0 = yaml.dump(bean);
// System.out.println(output0);
assertEquals("!!org.yaml.snakeyaml.issues.issue124.Bean124 {a: aaa, b: bbb}\n", output0);
- String output1 = yaml.dumpAs(bean, Tag.MAP);
+ String output1 = yaml.dumpAs(bean);
// System.out.println(output1);
assertEquals("a: aaa\nb: bbb\n", output1);
String output2 = yaml.dump(bean);
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue40/DogFoodBeanTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue40/DogFoodBeanTest.java
index f178518..cd1faea 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue40/DogFoodBeanTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue40/DogFoodBeanTest.java
@@ -21,7 +21,6 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class DogFoodBeanTest extends TestCase {
@@ -52,7 +51,7 @@
DogFoodBean input = new DogFoodBean();
input.setDecimal(new BigDecimal("5.123"));
Yaml yaml = new Yaml();
- String text = yaml.dumpAs(input, Tag.MAP);
+ String text = yaml.dumpAs(input);
// System.out.println(text);
assertEquals("decimal: 5.123\n", text);
Yaml loader = new Yaml();
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue47/ReadOnlyPropertiesTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue47/ReadOnlyPropertiesTest.java
index 1aeaa70..a1df993 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue47/ReadOnlyPropertiesTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue47/ReadOnlyPropertiesTest.java
@@ -21,14 +21,13 @@
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.error.YAMLException;
-import org.yaml.snakeyaml.nodes.Tag;
public class ReadOnlyPropertiesTest extends TestCase {
public void testBean1() {
IncompleteBean bean = new IncompleteBean();
bean.setName("lunch");
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
assertEquals("name: lunch\n", output);
//
@@ -43,7 +42,7 @@
DumperOptions options = new DumperOptions();
options.setAllowReadOnlyProperties(true);
Yaml yaml = new Yaml(options);
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
assertEquals("id: 10\nname: lunch\n", output);
//
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue48/SkipJavaBeanPropertyTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue48/SkipJavaBeanPropertyTest.java
index 33210ae..006c7d5 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue48/SkipJavaBeanPropertyTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue48/SkipJavaBeanPropertyTest.java
@@ -31,7 +31,7 @@
Bean bean = new Bean();
bean.setValue(3);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
assertEquals("name: null\nvalue: 3\n", output);
}
@@ -40,7 +40,7 @@
Bean bean = new Bean();
bean.setValue(5);
Yaml yaml = new Yaml(new MyRepresenter());
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
assertEquals("value: 5\n", output);
}
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue49/CalendarTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue49/CalendarTest.java
index 8608963..b665f06 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue49/CalendarTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue49/CalendarTest.java
@@ -24,7 +24,6 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class CalendarTest extends TestCase {
/**
@@ -38,7 +37,7 @@
cal.setTimeZone(TimeZone.getTimeZone("GMT-8:00"));
bean.setCalendar(cal);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
assertEquals("calendar: 2001-09-08T17:46:40-8:00\nname: lunch\n", output);
//
@@ -88,7 +87,7 @@
cal.setTimeZone(TimeZone.getTimeZone(timeZone));
bean.setCalendar(cal);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
assertEquals(warning, "calendar: " + etalon + "\nname: lunch\n", output);
//
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue55/YamlFieldAccessCollectionTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue55/YamlFieldAccessCollectionTest.java
index f17e4fb..6cd65af 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue55/YamlFieldAccessCollectionTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue55/YamlFieldAccessCollectionTest.java
@@ -24,7 +24,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.introspector.BeanAccess;
-import org.yaml.snakeyaml.nodes.Tag;
import org.yaml.snakeyaml.representer.Representer;
public class YamlFieldAccessCollectionTest extends TestCase {
@@ -32,7 +31,7 @@
public void testYaml() {
Blog original = createTestBlog();
Yaml yamlDumper = constructYamlDumper();
- String serialized = yamlDumper.dumpAs(original, Tag.MAP);
+ String serialized = yamlDumper.dumpAs(original);
// System.out.println(serialized);
assertEquals(Util.getLocalResource("issues/issue55_1.txt"), serialized);
Yaml blogLoader = new Yaml();
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue58/NullValueDumperTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue58/NullValueDumperTest.java
index 2c4c4aa..f4b23ec 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue58/NullValueDumperTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue58/NullValueDumperTest.java
@@ -21,7 +21,6 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class NullValueDumperTest extends TestCase {
@@ -43,7 +42,7 @@
foo.bar.add("A");
foo.bar.add(3.14);
Yaml yaml = new Yaml();
- assertEquals("bar:\n- 1\n- A\n- 3.14\n", yaml.dumpAs(foo, Tag.MAP));
+ assertEquals("bar:\n- 1\n- A\n- 3.14\n", yaml.dumpAs(foo));
}
public void testNullListElement() {
@@ -54,7 +53,7 @@
foo.bar.add(null);
foo.bar.add(3.14);
Yaml yaml = new Yaml();
- assertEquals("bar:\n- 1\n- A\n- null\n- 3.14\n", yaml.dumpAs(foo, Tag.MAP));
+ assertEquals("bar:\n- 1\n- A\n- null\n- 3.14\n", yaml.dumpAs(foo));
assertEquals(
"!!org.yaml.snakeyaml.issues.issue58.NullValueDumperTest$Foo\nbar: [1, A, null, 3.14]\n",
new Yaml().dump(foo));
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericListBeanTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericListBeanTest.java
index e2b56b6..064cfc0 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericListBeanTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericListBeanTest.java
@@ -23,7 +23,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class GenericListBeanTest extends TestCase {
@SuppressWarnings("unchecked")
@@ -32,7 +31,7 @@
ListProvider<String> listProvider = new ListProvider<String>();
listProvider.getList().add("foo");
listProvider.getList().add("bar");
- String s = yaml.dumpAs(listProvider, Tag.MAP);
+ String s = yaml.dumpAs(listProvider);
// System.out.println(s);
assertEquals("list:\n- foo\n- bar\n", s);
// parse
@@ -54,7 +53,7 @@
bar.setName("bar");
bar.setNumber(3);
listProvider.getList().add(bar);
- String s = yaml.dumpAs(listProvider, Tag.MAP);
+ String s = yaml.dumpAs(listProvider);
// System.out.println(s);
String etalon = Util.getLocalResource("issues/issue61-1.yaml");
assertEquals(etalon, s);
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java
index 856839c..4c45c7f 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java
@@ -23,7 +23,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class GenericMapBeanTest extends TestCase {
@SuppressWarnings("unchecked")
@@ -32,7 +31,7 @@
MapProvider<String, Integer> listProvider = new MapProvider<String, Integer>();
listProvider.getMap().put("foo", 17);
listProvider.getMap().put("bar", 19);
- String s = yaml.dumpAs(listProvider, Tag.MAP);
+ String s = yaml.dumpAs(listProvider);
// System.out.println(s);
assertEquals("map:\n foo: 17\n bar: 19\n", s);
// parse
@@ -54,7 +53,7 @@
bar.setName("bar");
bar.setNumber(3);
listProvider.getMap().put("bar", bar);
- String s = yaml.dumpAs(listProvider, Tag.MAP);
+ String s = yaml.dumpAs(listProvider);
// System.out.println(s);
String etalon = Util.getLocalResource("issues/issue61-2.yaml");
assertEquals(etalon, s);
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue72/CollectionTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue72/CollectionTest.java
index 24b26d0..92fbc2b 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue72/CollectionTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue72/CollectionTest.java
@@ -23,14 +23,13 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class CollectionTest extends TestCase {
public void testCollectionList() {
CollectionList bean = new CollectionList();
Yaml yaml = new Yaml();
- String doc = yaml.dumpAs(bean, Tag.MAP);
+ String doc = yaml.dumpAs(bean);
// System.out.println(doc);
Yaml beanLoader = new Yaml();
CollectionList parsed = beanLoader.loadAs(doc, CollectionList.class);
@@ -60,7 +59,7 @@
public void testCollectionSet() {
CollectionSet bean = new CollectionSet();
Yaml yaml = new Yaml();
- String doc = yaml.dumpAs(bean, Tag.MAP);
+ String doc = yaml.dumpAs(bean);
// System.out.println(doc);
Yaml beanLoader = new Yaml();
CollectionSet parsed = beanLoader.loadAs(doc, CollectionSet.class);
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue74/ArrayBeanTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue74/ArrayBeanTest.java
index 4b6dfbf..7054fd7 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue74/ArrayBeanTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue74/ArrayBeanTest.java
@@ -23,7 +23,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class ArrayBeanTest extends TestCase {
@@ -43,7 +42,7 @@
list.add(new ArrayMember("Tony", 222));
bean.setList(list);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(bean, Tag.MAP);
+ String output = yaml.dumpAs(bean);
// System.out.println(output);
assertEquals(Util.getLocalResource("issues/issue74-array1.txt"), output);
Yaml beanLoader = new Yaml();
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue82/PropOrderInfluenceWhenAliasedInGenericCollectionTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue82/PropOrderInfluenceWhenAliasedInGenericCollectionTest.java
index a82a6ce..71fdb15 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue82/PropOrderInfluenceWhenAliasedInGenericCollectionTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue82/PropOrderInfluenceWhenAliasedInGenericCollectionTest.java
@@ -239,7 +239,7 @@
customerAB.bGeneral = general;
Yaml yaml = new Yaml();
- String dump2 = yaml.dumpAs(customerAB, Tag.MAP);
+ String dump2 = yaml.dumpAs(customerAB);
// System.out.println(dump2);
Yaml loader = new Yaml();
CustomerAB parsed = loader.loadAs(dump2, CustomerAB.class);
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue95/ArrayInGenericCollectionTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue95/ArrayInGenericCollectionTest.java
index f0bc298..cc3b373 100644
--- a/src/test/java/org/yaml/snakeyaml/issues/issue95/ArrayInGenericCollectionTest.java
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue95/ArrayInGenericCollectionTest.java
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.junit.Assert;
+import org.yaml.snakeyaml.DumperOptions.FlowStyle;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@@ -138,7 +139,7 @@
Yaml yaml2dump = new Yaml();
yaml2dump.setBeanAccess(BeanAccess.FIELD);
B data = createB();
- String dump = yaml2dump.dumpAs(data, Tag.MAP);
+ String dump = yaml2dump.dumpAs(data, Tag.MAP, FlowStyle.AUTO);
// System.out.println(dump);
assertEquals("meta:\n- [whatever]\n- [something, something else]\n", dump);
//
diff --git a/src/test/java/org/yaml/snakeyaml/javabeans/HouseTest.java b/src/test/java/org/yaml/snakeyaml/javabeans/HouseTest.java
index f820bfa..3817c8a 100644
--- a/src/test/java/org/yaml/snakeyaml/javabeans/HouseTest.java
+++ b/src/test/java/org/yaml/snakeyaml/javabeans/HouseTest.java
@@ -29,7 +29,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.nodes.Tag;
public class HouseTest extends TestCase {
/**
@@ -51,7 +50,7 @@
house.setNumber(1);
house.setStreet("Wall Street");
Yaml beanDumper = new Yaml();
- String yaml = beanDumper.dumpAs(house, Tag.MAP);
+ String yaml = beanDumper.dumpAs(house);
String etalon = Util.getLocalResource("javabeans/house-dump1.yaml");
assertEquals(etalon, yaml);
// load
@@ -60,7 +59,7 @@
assertNotNull(loadedHouse);
assertEquals("Wall Street", loadedHouse.getStreet());
// dump again
- String yaml3 = beanDumper.dumpAs(loadedHouse, Tag.MAP);
+ String yaml3 = beanDumper.dumpAs(loadedHouse);
assertEquals(yaml, yaml3);
}
@@ -83,7 +82,7 @@
house.setNumber(1);
house.setStreet("Wall Street");
Yaml beanDumper = new Yaml();
- String yaml = beanDumper.dumpAs(house, Tag.MAP);
+ String yaml = beanDumper.dumpAs(house);
String etalon = Util.getLocalResource("javabeans/house-dump3.yaml");
assertEquals(etalon, yaml);
// load
@@ -106,7 +105,7 @@
List<Room> loadedRooms = loadedHouse.getRooms();
assertEquals(rooms, loadedRooms);
// dump again
- String yaml3 = beanDumper.dumpAs(loadedHouse, Tag.MAP);
+ String yaml3 = beanDumper.dumpAs(loadedHouse);
assertEquals(yaml, yaml3);
}
diff --git a/src/test/java/org/yaml/snakeyaml/javabeans/TriangleBeanTest.java b/src/test/java/org/yaml/snakeyaml/javabeans/TriangleBeanTest.java
index 7cf5fde..822f0b3 100644
--- a/src/test/java/org/yaml/snakeyaml/javabeans/TriangleBeanTest.java
+++ b/src/test/java/org/yaml/snakeyaml/javabeans/TriangleBeanTest.java
@@ -19,7 +19,6 @@
import junit.framework.TestCase;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class TriangleBeanTest extends TestCase {
@@ -30,7 +29,7 @@
bean.setShape(triangle);
bean.setName("Bean25");
Yaml beanDumper = new Yaml();
- String output = beanDumper.dumpAs(bean, Tag.MAP);
+ String output = beanDumper.dumpAs(bean);
assertEquals(
"name: Bean25\nshape: !!org.yaml.snakeyaml.javabeans.Triangle\n name: Triangle25\n",
output);
diff --git a/src/test/java/org/yaml/snakeyaml/recursive/HumanTest.java b/src/test/java/org/yaml/snakeyaml/recursive/HumanTest.java
index ae89c57..c3926f8 100644
--- a/src/test/java/org/yaml/snakeyaml/recursive/HumanTest.java
+++ b/src/test/java/org/yaml/snakeyaml/recursive/HumanTest.java
@@ -35,7 +35,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.nodes.Tag;
public class HumanTest extends TestCase {
@@ -132,7 +131,7 @@
mother.setChildren(children);
//
Yaml beanDumper = new Yaml();
- String output = beanDumper.dumpAs(son, Tag.MAP);
+ String output = beanDumper.dumpAs(son);
// System.out.println(output);
String etalon = Util.getLocalResource("recursive/with-children.yaml");
assertEquals(etalon, output);
@@ -627,7 +626,7 @@
mother.setChildren(children);
//
Yaml beanDumper = new Yaml();
- String output = beanDumper.dumpAs(son, Tag.MAP);
+ String output = beanDumper.dumpAs(son);
// System.out.println(output);
String etalon = Util.getLocalResource("recursive/with-children-no-root-tag.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/org/yaml/snakeyaml/recursive/Human_WithArrayOfChildrenTest.java b/src/test/java/org/yaml/snakeyaml/recursive/Human_WithArrayOfChildrenTest.java
index 68a3915..3ecd62b 100644
--- a/src/test/java/org/yaml/snakeyaml/recursive/Human_WithArrayOfChildrenTest.java
+++ b/src/test/java/org/yaml/snakeyaml/recursive/Human_WithArrayOfChildrenTest.java
@@ -25,7 +25,6 @@
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.nodes.Tag;
public class Human_WithArrayOfChildrenTest extends TestCase {
@@ -165,7 +164,7 @@
public void testDumpChildrenArrayWithoutRootTag() throws IOException {
Yaml yaml = new Yaml();
Human_WithArrayOfChildren son = createSon();
- String output = yaml.dumpAs(son, Tag.MAP);
+ String output = yaml.dumpAs(son);
// System.out.println(output);
String etalon = Util.getLocalResource("recursive/with-childrenArray-no-root-tag.yaml");
assertEquals(etalon, output);
diff --git a/src/test/java/org/yaml/snakeyaml/recursive/generics/HumanGenericsTest.java b/src/test/java/org/yaml/snakeyaml/recursive/generics/HumanGenericsTest.java
index a009007..89a06dc 100644
--- a/src/test/java/org/yaml/snakeyaml/recursive/generics/HumanGenericsTest.java
+++ b/src/test/java/org/yaml/snakeyaml/recursive/generics/HumanGenericsTest.java
@@ -91,7 +91,7 @@
mother.setPartner(father);
mother.setBankAccountOwner(father);
Yaml yaml = new Yaml();
- String output = yaml.dumpAs(father, Tag.MAP);
+ String output = yaml.dumpAs(father);
String etalon = Util.getLocalResource("recursive/generics/no-children-2.yaml");
assertEquals(etalon, output);
//
diff --git a/src/test/java/org/yaml/snakeyaml/representer/FilterPropertyToDumpTest.java b/src/test/java/org/yaml/snakeyaml/representer/FilterPropertyToDumpTest.java
index 5348d4f..dd40fb6 100644
--- a/src/test/java/org/yaml/snakeyaml/representer/FilterPropertyToDumpTest.java
+++ b/src/test/java/org/yaml/snakeyaml/representer/FilterPropertyToDumpTest.java
@@ -25,7 +25,6 @@
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.introspector.Property;
-import org.yaml.snakeyaml.nodes.Tag;
public class FilterPropertyToDumpTest extends TestCase {
@@ -34,7 +33,7 @@
bean.setNumber(24);
bean.setId("ID124");
Yaml d = new Yaml();
- String dump = d.dumpAs(bean, Tag.MAP);
+ String dump = d.dumpAs(bean);
// System.out.println(dump);
assertEquals("id: ID124\nnumber: 24\n", dump);
}
@@ -44,7 +43,7 @@
bean.setNumber(25);
bean.setId("ID125");
Yaml yaml = new Yaml(new MyRepresenter());
- String dump = yaml.dumpAs(bean, Tag.MAP);
+ String dump = yaml.dumpAs(bean);
// System.out.println(dump);
assertEquals("number: 25\n", dump);
}
diff --git a/src/test/java/org/yaml/snakeyaml/ruby/RubyTest.java b/src/test/java/org/yaml/snakeyaml/ruby/RubyTest.java
index e137951..46bd048 100644
--- a/src/test/java/org/yaml/snakeyaml/ruby/RubyTest.java
+++ b/src/test/java/org/yaml/snakeyaml/ruby/RubyTest.java
@@ -42,7 +42,7 @@
DumperOptions options = new DumperOptions();
options.setExplicitStart(true);
Yaml yaml2 = new Yaml(options);
- String output = yaml2.dumpAs(result, Tag.MAP);
+ String output = yaml2.dumpAs(result);
assertFalse("No tags expected.", output.contains("Sub1"));
// System.out.println(output);
// parse back. Without tags it shall still work
diff --git a/src/test/java/org/yaml/snakeyaml/stress/StressEmitterTest.java b/src/test/java/org/yaml/snakeyaml/stress/StressEmitterTest.java
index 68ded6b..927fa9e 100644
--- a/src/test/java/org/yaml/snakeyaml/stress/StressEmitterTest.java
+++ b/src/test/java/org/yaml/snakeyaml/stress/StressEmitterTest.java
@@ -25,7 +25,6 @@
import org.yaml.snakeyaml.Invoice;
import org.yaml.snakeyaml.Util;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.nodes.Tag;
public class StressEmitterTest extends TestCase {
@@ -43,7 +42,7 @@
Invoice.class);
Yaml dumper = new Yaml();
long time1 = System.nanoTime();
- dumper.dumpAs(invoice, Tag.MAP);
+ dumper.dumpAs(invoice);
long time2 = System.nanoTime();
float duration = (time2 - time1) / 1000000;
System.out.println("\nSingle dump was " + duration + " ms.");
@@ -69,7 +68,7 @@
time1 = System.nanoTime();
for (int i = 0; i < number; i++) {
dumper = new Yaml();
- dumper.dumpAs(invoice, Tag.MAP);
+ dumper.dumpAs(invoice);
}
time2 = System.nanoTime();
duration = ((time2 - time1) / 1000000) / (float) number;
