Repository: incubator-juneau Updated Branches: refs/heads/master 47b9ce605 -> e1c60b101
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/test/java/org/apache/juneau/xml/XmlTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/xml/XmlTest.java b/juneau-core/src/test/java/org/apache/juneau/xml/XmlTest.java index b18d83d..1d6368a 100755 --- a/juneau-core/src/test/java/org/apache/juneau/xml/XmlTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/xml/XmlTest.java @@ -82,7 +82,7 @@ public class XmlTest { } /** Class with explicitly specified properties */ - @Bean(name="Person1", properties = { "name", "age" }) + @Bean(typeName="Person1", properties = { "name", "age" }) public static class Person1 { public int age; private String name; @@ -123,7 +123,7 @@ public class XmlTest { validateXml(t); } - @Bean(name="foo") + @Bean(typeName="foo") public static class A { public int f1 = 1; } @@ -155,7 +155,7 @@ public class XmlTest { validateXml(t); } - @Bean(name="foo") + @Bean(typeName="foo") public static interface C1 {} public static class C2 implements C1 {} public static class C3 extends C2 { @@ -176,7 +176,7 @@ public class XmlTest { validateXml(t); } - @Bean(name="~!@#$%^&*()_+`-={}|[]\\:\";'<>?,.\n\r\t\b") + @Bean(typeName="~!@#$%^&*()_+`-={}|[]\\:\";'<>?,.\n\r\t\b") public static class D { public int f1 = 1; } @@ -197,7 +197,7 @@ public class XmlTest { validateXml(t); } - @Bean(name="foo") + @Bean(typeName="foo") public static class F extends LinkedList<String>{} //==================================================================================================== @@ -216,49 +216,49 @@ public class XmlTest { validateXml(t); } - @Bean(name="bar") + @Bean(typeName="bar") public static class G { public F f1 = new F(); } - //==================================================================================================== - // Element name on not-a-bean. - //==================================================================================================== - @Test - public void testElementNameOnNotABean() throws Exception { - XmlSerializer s = XmlSerializer.DEFAULT_SIMPLE_SQ; - H t = new H(); - String r = s.serialize(t); - assertEquals("<foo>bar</foo>", r); - } - - @Pojo(name="foo") - public static class H { - @Override /* Object */ - public String toString() { - return "bar"; - } - } - - //==================================================================================================== - // Fields with element name on not-a-beans. - // Element name should be used on array field entries, but not regular field. - //==================================================================================================== - @Test - public void testFieldsWithElementNameOnNotABeans() throws Exception { - XmlSerializer s = XmlSerializer.DEFAULT_SIMPLE_SQ; - I t = new I(); - String r = s.serialize(t); - assertEquals("<object><f1>bar</f1><f2><foo>bar</foo><foo>bar</foo></f2></object>", r); - } - - public static class I { - public H f1 = new H(); - public H[] f2 = { - new H(), - new H() - }; - } +// //==================================================================================================== +// // Element name on not-a-bean. +// //==================================================================================================== +// @Test +// public void testElementNameOnNotABean() throws Exception { +// XmlSerializer s = XmlSerializer.DEFAULT_SIMPLE_SQ; +// H t = new H(); +// String r = s.serialize(t); +// assertEquals("<foo>bar</foo>", r); +// } +// +// @Pojo(name="foo") +// public static class H { +// @Override /* Object */ +// public String toString() { +// return "bar"; +// } +// } +// +// //==================================================================================================== +// // Fields with element name on not-a-beans. +// // Element name should be used on array field entries, but not regular field. +// //==================================================================================================== +// @Test +// public void testFieldsWithElementNameOnNotABeans() throws Exception { +// XmlSerializer s = XmlSerializer.DEFAULT_SIMPLE_SQ; +// I t = new I(); +// String r = s.serialize(t); +// assertEquals("<object><f1>bar</f1><f2><foo>bar</foo><foo>bar</foo></f2></object>", r); +// } +// +// public static class I { +// public H f1 = new H(); +// public H[] f2 = { +// new H(), +// new H() +// }; +// } //==================================================================================================== // Element name on beans of a collection. @@ -271,13 +271,13 @@ public class XmlTest { assertEquals("<foo><f1><bar><f2>2</f2></bar></f1></foo>", r); } - @Bean(name="foo") + @Bean(typeName="foo") public static class J1 { @BeanProperty(properties={"f2"}) public List<J2> f1 = new LinkedList<J2>() {{ add(new J2()); }};} - @Bean(name="bar") + @Bean(typeName="bar") public static class J2 { public int f2 = 2; public int f3 = 3; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/test/java/org/apache/juneau/xml/xml1a/T2.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/xml/xml1a/T2.java b/juneau-core/src/test/java/org/apache/juneau/xml/xml1a/T2.java index 793f295..5c43344 100755 --- a/juneau-core/src/test/java/org/apache/juneau/xml/xml1a/T2.java +++ b/juneau-core/src/test/java/org/apache/juneau/xml/xml1a/T2.java @@ -16,7 +16,7 @@ import org.apache.juneau.annotation.*; import org.apache.juneau.xml.annotation.*; @Xml(prefix="foo",namespace="http://foo";) -@Bean(name="T2", sort=true) +@Bean(typeName="T2", sort=true) @SuppressWarnings("javadoc") public class T2 { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T4.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T4.java b/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T4.java index 799da39..b1acc8a 100755 --- a/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T4.java +++ b/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T4.java @@ -15,7 +15,7 @@ package org.apache.juneau.xml.xml1b; import org.apache.juneau.annotation.*; import org.apache.juneau.xml.annotation.*; -@Bean(name="T4", sort=true) +@Bean(typeName="T4", sort=true) @SuppressWarnings("javadoc") public class T4 { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T5.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T5.java b/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T5.java index fa10cea..9aefbff 100755 --- a/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T5.java +++ b/juneau-core/src/test/java/org/apache/juneau/xml/xml1b/T5.java @@ -16,7 +16,7 @@ import org.apache.juneau.annotation.*; import org.apache.juneau.xml.annotation.*; @Xml(prefix="foo",namespace="http://foo";) -@Bean(name="T5", sort=true) +@Bean(typeName="T5", sort=true) @SuppressWarnings("javadoc") public class T5 { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Address.java ---------------------------------------------------------------------- diff --git a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Address.java b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Address.java index f3f309c..5e0fe7b 100755 --- a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Address.java +++ b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Address.java @@ -23,7 +23,7 @@ import org.apache.juneau.xml.annotation.*; */ @Xml(prefix="addr") @Rdf(prefix="addr") -@Bean(name="address") +@Bean(typeName="address") public class Address { private static int nextAddressId = 1; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/AddressBook.java ---------------------------------------------------------------------- diff --git a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/AddressBook.java b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/AddressBook.java index 910b804..4983a58 100755 --- a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/AddressBook.java +++ b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/AddressBook.java @@ -21,7 +21,7 @@ import org.apache.juneau.annotation.*; /** * Address book bean */ -@Bean(name="addressBook") +@Bean(typeName="addressBook") public class AddressBook extends LinkedList<Person> implements IAddressBook { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreateAddress.java ---------------------------------------------------------------------- diff --git a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreateAddress.java b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreateAddress.java index fde34b9..8478026 100755 --- a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreateAddress.java +++ b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreateAddress.java @@ -21,7 +21,7 @@ import org.apache.juneau.xml.annotation.*; */ @Xml(prefix="addr") @Rdf(prefix="addr") -@Bean(name="address") +@Bean(typeName="address") public class CreateAddress { // Bean properties http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreatePerson.java ---------------------------------------------------------------------- diff --git a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreatePerson.java b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreatePerson.java index 8a0f2fe..1ce686a 100755 --- a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreatePerson.java +++ b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/CreatePerson.java @@ -24,7 +24,7 @@ import org.apache.juneau.xml.annotation.*; */ @Xml(prefix="per") @Rdf(prefix="per") -@Bean(name="person") +@Bean(typeName="person") public class CreatePerson { // Bean properties http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Person.java ---------------------------------------------------------------------- diff --git a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Person.java b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Person.java index ee93242..4dc4f26 100755 --- a/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Person.java +++ b/juneau-samples/src/main/java/org/apache/juneau/samples/addressbook/Person.java @@ -25,7 +25,7 @@ import org.apache.juneau.xml.annotation.*; */ @Xml(prefix="per") @Rdf(prefix="per") -@Bean(name="person") +@Bean(typeName="person") public class Person { private static int nextPersonId = 1;
