You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2016/09/07 20:27:28 UTC
[1/4] incubator-juneau git commit: Rename classLexicon to
typeDictionary, and other minor field name changes.
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;
[3/4] incubator-juneau git commit: Rename classLexicon to
typeDictionary, and other minor field name changes.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java
index 6f7b554..a2f3f7d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="blockquote")
+@Bean(typeName="blockquote")
public class Blockquote extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java
index f91e742..ccdb69b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="body")
+@Bean(typeName="body")
public class Body extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java
index 3104a35..ac3d747 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="br")
+@Bean(typeName="br")
public class Br extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java
index babcf56..a933b75 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="button")
+@Bean(typeName="button")
public class Button extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java
index 81e5af8..1adbef2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="canvas")
+@Bean(typeName="canvas")
public class Canvas extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java
index 1c2b149..18118f2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="caption")
+@Bean(typeName="caption")
public class Caption extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java
index 9bfa180..190b51a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="cite")
+@Bean(typeName="cite")
public class Cite extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java
index 1383a7a..2870e71 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="code")
+@Bean(typeName="code")
public class Code extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java
index 80510b2..ef8aeca 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="col")
+@Bean(typeName="col")
public class Col extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java
index 0fa0ae3..a7f3867 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="colgroup")
+@Bean(typeName="colgroup")
public class Colgroup extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java
index d880f14..b60654e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="command")
+@Bean(typeName="command")
public class Command extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java
index 7e241a9..92f947f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="data")
+@Bean(typeName="data")
public class Data extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java
index de6b668..234f0e1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="datalist")
+@Bean(typeName="datalist")
public class Datalist extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java
index 74307a7..35cad9f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="dd")
+@Bean(typeName="dd")
public class Dd extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java
index 691b748..ad0ffc1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="del")
+@Bean(typeName="del")
public class Del extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java
index e0b7229..6f2f673 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="details")
+@Bean(typeName="details")
public class Details extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java
index 9eb6014..cf90fb6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="dfn")
+@Bean(typeName="dfn")
public class Dfn extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java
index cad1884..c16a3f1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="div")
+@Bean(typeName="div")
public class Div extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java
index f08c916..8f35c5e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="dl")
+@Bean(typeName="dl")
public class Dl extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java
index 9832121..4eee40e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="dt")
+@Bean(typeName="dt")
public class Dt extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java
index 730f265..84ab815 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="em")
+@Bean(typeName="em")
public class Em extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java
index ca68607..dc053b3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="embed")
+@Bean(typeName="embed")
public class Embed extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java
index ee1d66e..528b20e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="fieldset")
+@Bean(typeName="fieldset")
public class Fieldset extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java
index 6c182f4..ac3634e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="figcaption")
+@Bean(typeName="figcaption")
public class Figcaption extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java
index 3258a1b..9775b75 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="figure")
+@Bean(typeName="figure")
public class Figure extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java
index 4df1c37..e91f1c5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="footer")
+@Bean(typeName="footer")
public class Footer extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java
index 5e45754..213066e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="form")
+@Bean(typeName="form")
public class Form extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java
index f6463fc..bb08d2d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="h1")
+@Bean(typeName="h1")
public class H1 extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java
index a3e6141..a72e2ac 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="h2")
+@Bean(typeName="h2")
public class H2 extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java
index 1e2d078..6b6130f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="h3")
+@Bean(typeName="h3")
public class H3 extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java
index 8d16df3..3c38bc5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="h4")
+@Bean(typeName="h4")
public class H4 extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java
index 4f37974..ee66856 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="h5")
+@Bean(typeName="h5")
public class H5 extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java
index 3f8aba4..55f2007 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="h6")
+@Bean(typeName="h6")
public class H6 extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java
index a969d82..181aead 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="head")
+@Bean(typeName="head")
public class Head extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java
index fa1b29c..3306572 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="header")
+@Bean(typeName="header")
public class Header extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java
index 64a90f7..cacd598 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="hgroup")
+@Bean(typeName="hgroup")
public class Hgroup extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java
index b0b7bf0..fbc1832 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="hr")
+@Bean(typeName="hr")
public class Hr extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java
index 91d7f8c..77ce8eb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="html")
+@Bean(typeName="html")
public class Html extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java
index ad4f319..4b2ea8a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="i")
+@Bean(typeName="i")
public class I extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java
index a9f16bc..5dfc9cf 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="iframe")
+@Bean(typeName="iframe")
public class IFrame extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java
index 46d9c12..0e37a3a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java
@@ -22,7 +22,7 @@ import org.apache.juneau.xml.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="img")
+@Bean(typeName="img")
public class Img extends HtmlElement {
/** <code>src</code> attribute */
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java
index e80a905..f3a46a6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="input")
+@Bean(typeName="input")
public class Input extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java
index 5a197ff..7506cd4 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="ins")
+@Bean(typeName="ins")
public class Ins extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java
index acacf64..d635b42 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="kbd")
+@Bean(typeName="kbd")
public class Kbd extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java
index ca2b7e3..34e2bc6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="keygen")
+@Bean(typeName="keygen")
public class Keygen extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java
index 12a97ae..23d51d0 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="label")
+@Bean(typeName="label")
public class Label extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java
index 396aa9c..191b911 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="legend")
+@Bean(typeName="legend")
public class Legend extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java
index b813adc..6aeedbe 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="li")
+@Bean(typeName="li")
public class Li extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java
index 022d4fd..132c38f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="link")
+@Bean(typeName="link")
public class Link extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java
index 65758dd..9078860 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="main")
+@Bean(typeName="main")
public class Main extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java
index 94d7960..8405696 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="map")
+@Bean(typeName="map")
public class Map extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java
index d3b243f..ea2c420 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="mark")
+@Bean(typeName="mark")
public class Mark extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java
index 3c9e090..735e18d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="menu")
+@Bean(typeName="menu")
public class Menu extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java
index 9d42870..b1b95c2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="meta")
+@Bean(typeName="meta")
public class Meta extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java
index 1f7e4f8..9ce1258 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="meter")
+@Bean(typeName="meter")
public class Meter extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java
index 2117b5f..948d09f 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="nav")
+@Bean(typeName="nav")
public class Nav extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java
index 76bc6a0..e8d1e12 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="noscript")
+@Bean(typeName="noscript")
public class Noscript extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java
index 2f484fd..ace54a9 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="object")
+@Bean(typeName="object")
public class Object extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java
index f286ca2..43d0df2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="ol")
+@Bean(typeName="ol")
public class Ol extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java
index de257a5..8d20ec4 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="optgroup")
+@Bean(typeName="optgroup")
public class Optgroup extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java
index e9d5df5..88994e4 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="option")
+@Bean(typeName="option")
public class Option extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java
index 7108913..7ef70c8 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="output")
+@Bean(typeName="output")
public class Output extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java
index 9e1ab2f..3906842 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="p")
+@Bean(typeName="p")
public class P extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java
index 266a635..f97da92 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="param")
+@Bean(typeName="param")
public class Param extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java
index 8e7cfc8..a314039 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="pre")
+@Bean(typeName="pre")
public class Pre extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java
index 7183771..4ad51e9 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="progress")
+@Bean(typeName="progress")
public class Progress extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java
index 2f30efb..f479df2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="q")
+@Bean(typeName="q")
public class Q extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java
index aafd654..218ca68 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="rb")
+@Bean(typeName="rb")
public class Rb extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java
index 067d9ba..7312d46 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="rp")
+@Bean(typeName="rp")
public class Rp extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java
index e7271f5..88ab877 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="rt")
+@Bean(typeName="rt")
public class Rt extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java
index 71a658a..0e96b6a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="rtc")
+@Bean(typeName="rtc")
public class Rtc extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java
index e8d5b17..c7d6bbe 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="ruby")
+@Bean(typeName="ruby")
public class Ruby extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java
index 7afea70..79c7959 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="s")
+@Bean(typeName="s")
public class S extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java
index dcf15bd..2b0c231 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="samp")
+@Bean(typeName="samp")
public class Samp extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java
index 340e18c..6cc2b0a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="script")
+@Bean(typeName="script")
public class Script extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java
index 166e36c..e7111eb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="section")
+@Bean(typeName="section")
public class Section extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java
index 6985792..1c35ebe 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="select")
+@Bean(typeName="select")
public class Select extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java
index cbabb7f..e83f163 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="small")
+@Bean(typeName="small")
public class Small extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java
index a3cb8ba..b86c60c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="source")
+@Bean(typeName="source")
public class Source extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java
index 226c275..c8e0ce6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="span")
+@Bean(typeName="span")
public class Span extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java
index c64a1fb..bd79b18 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="strong")
+@Bean(typeName="strong")
public class Strong extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java
index 8ecc1c9..bb5708b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="style")
+@Bean(typeName="style")
public class Style extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java
index 8023478..a929de7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="sub")
+@Bean(typeName="sub")
public class Sub extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java
index a44d9e3..f11b57a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="summary")
+@Bean(typeName="summary")
public class Summary extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java
index ce7c58b..dac094b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="sup")
+@Bean(typeName="sup")
public class Sup extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java
index 601584c..9dd21b7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="table")
+@Bean(typeName="table")
public class Table extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java
index a70f0a4..5977095 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="tbody")
+@Bean(typeName="tbody")
public class Tbody extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java
index b0e075e..721fed1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="td")
+@Bean(typeName="td")
public class Td extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java
index 45be851..1be6831 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="template")
+@Bean(typeName="template")
public class Template extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java
index 72822fe..6a1629d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="textarea")
+@Bean(typeName="textarea")
public class Textarea extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java
index d634089..f0918db 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="tfoot")
+@Bean(typeName="tfoot")
public class Tfoot extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java
index 6645d2a..3f72d36 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="th")
+@Bean(typeName="th")
public class Th extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java
index 0351fd8..94351f9 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="thead")
+@Bean(typeName="thead")
public class Thead extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java
index 47ee4a4..dd292ff 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="time")
+@Bean(typeName="time")
public class Time extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java
index 31192ae..48a0b88 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="title")
+@Bean(typeName="title")
public class Title extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java
index f0a0e3f..238816b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="tr")
+@Bean(typeName="tr")
public class Tr extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java
index f56563f..00c851e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="track")
+@Bean(typeName="track")
public class Track extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java
index 3614bce..fa5f36e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="u")
+@Bean(typeName="u")
public class U extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java
index 499f8ed..9e7cc83 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="ul")
+@Bean(typeName="ul")
public class Ul extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java
index 98fb564..b1a72a3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="var")
+@Bean(typeName="var")
public class Var extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java
index 1923097..7c88b33 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="video")
+@Bean(typeName="video")
public class Video extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java
index 1b2df11..96f6ca3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="wbr")
+@Bean(typeName="wbr")
public class Wbr extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java
index 2171862..ef482e6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -238,22 +238,22 @@ public class RdfParser extends ReaderParser {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
- private <T> T parseAnything(RdfParserSession session, ClassMeta<T> nt, RDFNode n, Object outer) throws Exception {
+ private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer) throws Exception {
BeanContext bc = session.getBeanContext();
- if (nt == null)
- nt = (ClassMeta<T>)object();
- PojoSwap<T,Object> transform = (PojoSwap<T,Object>)nt.getPojoSwap();
- ClassMeta<?> ft = nt.getSerializedClassMeta();
- session.setCurrentClass(ft);
+ if (eType == null)
+ eType = (ClassMeta<T>)object();
+ PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();
+ ClassMeta<?> sType = eType.getSerializedClassMeta();
+ session.setCurrentClass(sType);
- if (! ft.canCreateNewInstance(outer)) {
+ if (! sType.canCreateNewInstance(outer)) {
if (n.isResource()) {
Statement st = n.asResource().getProperty(session.getClassProperty());
if (st != null) {
String c = st.getLiteral().getString();
- ft = nt = (ClassMeta<T>)bc.getClassMetaFromString(c);
+ sType = eType = (ClassMeta<T>)bc.getClassMetaFromString(c);
}
}
}
@@ -261,7 +261,7 @@ public class RdfParser extends ReaderParser {
Object o = null;
if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) {
// Do nothing. Leave o == null.
- } else if (ft.isObject()) {
+ } else if (sType.isObject()) {
if (n.isLiteral()) {
o = n.asLiteral().getValue();
if (o instanceof String) {
@@ -276,13 +276,13 @@ public class RdfParser extends ReaderParser {
o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer);
} else if (isSeq(session, r)) {
o = new ObjectList(bc);
- parseIntoCollection(session, r.as(Seq.class), (Collection)o, ft.getElementType());
+ parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType());
} else if (isBag(session, r)) {
o = new ObjectList(bc);
- parseIntoCollection(session, r.as(Bag.class), (Collection)o, ft.getElementType());
+ parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType());
} else if (r.canAs(RDFList.class)) {
o = new ObjectList(bc);
- parseIntoCollection(session, r.as(RDFList.class), (Collection)o, ft.getElementType());
+ parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType());
} else {
// If it has a URI and no child properties, we interpret this as an
// external resource, and convert it to just a URL.
@@ -297,67 +297,67 @@ public class RdfParser extends ReaderParser {
} else {
throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n);
}
- } else if (ft.isBoolean()) {
+ } else if (sType.isBoolean()) {
o = bc.convertToType(getValue(session, n, outer), boolean.class);
- } else if (ft.isCharSequence()) {
+ } else if (sType.isCharSequence()) {
o = session.decodeString(getValue(session, n, outer));
- } else if (ft.isChar()) {
+ } else if (sType.isChar()) {
o = session.decodeString(getValue(session, n, outer)).charAt(0);
- } else if (ft.isNumber()) {
- o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)ft.getInnerClass());
- } else if (ft.isMap()) {
+ } else if (sType.isNumber()) {
+ o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass());
+ } else if (sType.isMap()) {
Resource r = n.asResource();
if (session.wasAlreadyProcessed(r))
return null;
- Map m = (ft.canCreateNewInstance(outer) ? (Map)ft.newInstance(outer) : new ObjectMap(bc));
- o = parseIntoMap(session, r, m, nt.getKeyType(), nt.getValueType());
- } else if (ft.isCollection() || ft.isArray()) {
- if (ft.isArray())
+ Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(bc));
+ o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType());
+ } else if (sType.isCollection() || sType.isArray()) {
+ if (sType.isArray())
o = new ArrayList();
else
- o = (ft.canCreateNewInstance(outer) ? (Collection<?>)ft.newInstance(outer) : new ObjectList(bc));
+ o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(bc));
Resource r = n.asResource();
if (session.wasAlreadyProcessed(r))
return null;
if (isSeq(session, r)) {
- parseIntoCollection(session, r.as(Seq.class), (Collection)o, ft.getElementType());
+ parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType());
} else if (isBag(session, r)) {
- parseIntoCollection(session, r.as(Bag.class), (Collection)o, ft.getElementType());
+ parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType());
} else if (r.canAs(RDFList.class)) {
- parseIntoCollection(session, r.as(RDFList.class), (Collection)o, ft.getElementType());
+ parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType());
} else {
throw new ParseException("Unrecognized node type ''{0}'' for collection", n);
}
- if (ft.isArray())
- o = bc.toArray(ft, (Collection)o);
- } else if (ft.canCreateNewInstanceFromObjectMap(outer)) {
+ if (sType.isArray())
+ o = bc.toArray(sType, (Collection)o);
+ } else if (sType.canCreateNewInstanceFromObjectMap(outer)) {
Resource r = n.asResource();
if (session.wasAlreadyProcessed(r))
return null;
Map m = new ObjectMap(bc);
- parseIntoMap(session, r, m, nt.getKeyType(), nt.getValueType());
- o = ft.newInstanceFromObjectMap(outer, (ObjectMap)m);
- } else if (ft.canCreateNewBean(outer)) {
+ parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType());
+ o = sType.newInstanceFromObjectMap(outer, (ObjectMap)m);
+ } else if (sType.canCreateNewBean(outer)) {
Resource r = n.asResource();
if (session.wasAlreadyProcessed(r))
return null;
- BeanMap<?> bm = bc.newBeanMap(outer, ft.getInnerClass());
+ BeanMap<?> bm = bc.newBeanMap(outer, sType.getInnerClass());
o = parseIntoBeanMap(session, r, bm).getBean();
- } else if (ft.isUri() && n.isResource()) {
- o = ft.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));
- } else if (ft.canCreateNewInstanceFromString(outer)) {
- o = ft.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));
- } else if (ft.canCreateNewInstanceFromNumber(outer)) {
- o = ft.newInstanceFromNumber(outer, parseNumber(getValue(session, n, outer).toString(), ft.getNewInstanceFromNumberClass()));
+ } else if (sType.isUri() && n.isResource()) {
+ o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI()));
+ } else if (sType.canCreateNewInstanceFromString(outer)) {
+ o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer)));
+ } else if (sType.canCreateNewInstanceFromNumber(outer)) {
+ o = sType.newInstanceFromNumber(outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass()));
} else {
- throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", ft.getInnerClass().getName(), ft.getNotABeanReason());
+ throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());
}
if (transform != null && o != null)
- o = transform.unswap(o, nt, bc);
+ o = transform.unswap(o, eType, bc);
if (outer != null)
- setParent(nt, o, outer);
+ setParent(eType, o, outer);
return (T)o;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index f9d147e..492c2ed 100644
--- a/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -157,7 +157,7 @@ public class RdfSerializer extends WriterSerializer {
ClassMeta<?> aType = null; // The actual type
ClassMeta<?> wType = null; // The wrapped type
- ClassMeta<?> gType = object(); // The generic type
+ ClassMeta<?> sType = object(); // The serialized type
aType = session.push(attrName, o, eType);
@@ -177,7 +177,7 @@ public class RdfSerializer extends WriterSerializer {
aType = ((Delegate)o).getClassMeta();
}
- gType = aType.getSerializedClassMeta();
+ sType = aType.getSerializedClassMeta();
// Swap if necessary
PojoSwap swap = aType.getPojoSwap();
@@ -186,16 +186,16 @@ public class RdfSerializer extends WriterSerializer {
// If the getSwapClass() method returns Object, we need to figure out
// the actual type now.
- if (gType.isObject())
- gType = bc.getClassMetaForObject(o);
+ if (sType.isObject())
+ sType = bc.getClassMetaForObject(o);
}
} else {
- gType = eType.getSerializedClassMeta();
+ sType = eType.getSerializedClassMeta();
}
RDFNode n = null;
- if (o == null || gType.isChar() && ((Character)o).charValue() == 0) {
+ if (o == null || sType.isChar() && ((Character)o).charValue() == 0) {
if (bpm != null) {
if (! session.isTrimNulls()) {
n = m.createResource(RDF_NIL);
@@ -204,19 +204,19 @@ public class RdfSerializer extends WriterSerializer {
n = m.createResource(RDF_NIL);
}
- } else if (gType.isUri() || isURI) {
+ } else if (sType.isUri() || isURI) {
n = m.createResource(getUri(session, o, null));
- } else if (gType.isCharSequence() || gType.isChar()) {
+ } else if (sType.isCharSequence() || sType.isChar()) {
n = m.createLiteral(session.encodeTextInvalidChars(o));
- } else if (gType.isNumber() || gType.isBoolean()) {
+ } else if (sType.isNumber() || sType.isBoolean()) {
if (! session.isAddLiteralTypes())
n = m.createLiteral(o.toString());
else
n = m.createTypedLiteral(o);
- } else if (gType.isMap() || (wType != null && wType.isMap())) {
+ } else if (sType.isMap() || (wType != null && wType.isMap())) {
if (o instanceof BeanMap) {
BeanMap bm = (BeanMap)o;
Object uri = null;
@@ -229,15 +229,15 @@ public class RdfSerializer extends WriterSerializer {
} else {
Map m2 = (Map)o;
n = m.createResource();
- serializeMap(session, m2, (Resource)n, gType);
+ serializeMap(session, m2, (Resource)n, sType);
}
- } else if (gType.hasToObjectMapMethod()) {
- Map m2 = gType.toObjectMap(o);
+ } else if (sType.hasToObjectMapMethod()) {
+ Map m2 = sType.toObjectMap(o);
n = m.createResource();
- serializeMap(session, m2, (Resource)n, gType);
+ serializeMap(session, m2, (Resource)n, sType);
- } else if (gType.isBean()) {
+ } else if (sType.isBean()) {
BeanMap bm = bc.forBean(o);
Object uri = null;
RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);
@@ -247,19 +247,19 @@ public class RdfSerializer extends WriterSerializer {
n = m.createResource(uri2);
serializeBeanMap(session, bm, (Resource)n);
- } else if (gType.isCollection() || gType.isArray() || (wType != null && wType.isCollection())) {
- Collection c = session.sort(gType.isCollection() ? (Collection)o : toList(gType.getInnerClass(), o));
+ } else if (sType.isCollection() || sType.isArray() || (wType != null && wType.isCollection())) {
+ Collection c = session.sort(sType.isCollection() ? (Collection)o : toList(sType.getInnerClass(), o));
RdfCollectionFormat f = session.getCollectionFormat();
- RdfClassMeta rcm = gType.getExtendedMeta(RdfClassMeta.class);
+ RdfClassMeta rcm = sType.getExtendedMeta(RdfClassMeta.class);
if (rcm.getCollectionFormat() != RdfCollectionFormat.DEFAULT)
f = rcm.getCollectionFormat();
if (bpm != null && bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)
f = bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat();
switch (f) {
- case BAG: n = serializeToContainer(session, c, gType, m.createBag()); break;
- case LIST: n = serializeToList(session, c, gType); break;
- case MULTI_VALUED: serializeToMultiProperties(session, c, gType, bpm, attrName, parentResource); break;
- default: n = serializeToContainer(session, c, gType, m.createSeq());
+ case BAG: n = serializeToContainer(session, c, sType, m.createBag()); break;
+ case LIST: n = serializeToList(session, c, sType); break;
+ case MULTI_VALUED: serializeToMultiProperties(session, c, sType, bpm, attrName, parentResource); break;
+ default: n = serializeToContainer(session, c, sType, m.createSeq());
}
} else {
n = m.createLiteral(session.encodeTextInvalidChars(session.toString(o)));
@@ -379,8 +379,8 @@ public class RdfSerializer extends WriterSerializer {
return session.getModel().createList(l.iterator());
}
- private void serializeToMultiProperties(RdfSerializerSession session, Collection c, ClassMeta<?> gType, BeanPropertyMeta bpm, String attrName, Resource parentResource) throws SerializeException {
- ClassMeta<?> elementType = gType.getElementType();
+ private void serializeToMultiProperties(RdfSerializerSession session, Collection c, ClassMeta<?> sType, BeanPropertyMeta bpm, String attrName, Resource parentResource) throws SerializeException {
+ ClassMeta<?> elementType = sType.getElementType();
for (Object e : c) {
Namespace ns = null;
if (bpm != null) {
[2/4] incubator-juneau git commit: Rename classLexicon to
typeDictionary, and other minor field name changes.
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
index 3c1b0f6..5859825 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -99,15 +99,15 @@ public final class JsonParser extends ReaderParser {
/** Default parser, all default settings.*/
public static final JsonParser DEFAULT_STRICT = new JsonParser().setProperty(JSON_strictMode, true).lock();
- private <T> T parseAnything(JsonParserSession session, ClassMeta<T> nt, ParserReader r, Object outer) throws Exception {
+ private <T> T parseAnything(JsonParserSession session, ClassMeta<T> eType, ParserReader r, Object outer) throws Exception {
BeanContext bc = session.getBeanContext();
- if (nt == null)
- nt = (ClassMeta<T>)object();
- PojoSwap<T,Object> transform = (PojoSwap<T,Object>)nt.getPojoSwap();
- ClassMeta<?> ft = nt.getSerializedClassMeta();
- session.setCurrentClass(ft);
- String wrapperAttr = ft.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();
+ if (eType == null)
+ eType = (ClassMeta<T>)object();
+ PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();
+ ClassMeta<?> sType = eType.getSerializedClassMeta();
+ session.setCurrentClass(sType);
+ String wrapperAttr = sType.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();
Object o = null;
@@ -124,7 +124,7 @@ public final class JsonParser extends ReaderParser {
// Let o be null;
} else if (c == 'n') {
parseKeyword(session, "null", r);
- } else if (ft.isObject()) {
+ } else if (sType.isObject()) {
if (c == '{') {
ObjectMap m2 = new ObjectMap(bc);
parseIntoMap2(session, r, m2, string(), object());
@@ -133,7 +133,7 @@ public final class JsonParser extends ReaderParser {
o = parseIntoCollection2(session, r, new ObjectList(bc), object());
else if (c == '\'' || c == '"') {
o = parseString(session, r);
- if (ft.isChar())
+ if (sType.isChar())
o = o.toString().charAt(0);
}
else if (c >= '0' && c <= '9' || c == '-')
@@ -145,67 +145,67 @@ public final class JsonParser extends ReaderParser {
parseKeyword(session, "false", r);
o = Boolean.FALSE;
}
- } else if (ft.isBoolean()) {
+ } else if (sType.isBoolean()) {
o = parseBoolean(session, r);
- } else if (ft.isCharSequence()) {
+ } else if (sType.isCharSequence()) {
o = parseString(session, r);
- } else if (ft.isChar()) {
+ } else if (sType.isChar()) {
o = parseString(session, r).charAt(0);
- } else if (ft.isNumber()) {
- o = parseNumber(session, r, (Class<? extends Number>)ft.getInnerClass());
- } else if (ft.isMap()) {
- Map m = (ft.canCreateNewInstance(outer) ? (Map)ft.newInstance(outer) : new ObjectMap(bc));
- o = parseIntoMap2(session, r, m, ft.getKeyType(), ft.getValueType());
- } else if (ft.isCollection()) {
+ } else if (sType.isNumber()) {
+ o = parseNumber(session, r, (Class<? extends Number>)sType.getInnerClass());
+ } else if (sType.isMap()) {
+ Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(bc));
+ o = parseIntoMap2(session, r, m, sType.getKeyType(), sType.getValueType());
+ } else if (sType.isCollection()) {
if (c == '{') {
ObjectMap m = new ObjectMap(bc);
parseIntoMap2(session, r, m, string(), object());
o = m.cast();
} else {
- Collection l = (ft.canCreateNewInstance(outer) ? (Collection)ft.newInstance() : new ObjectList(bc));
- o = parseIntoCollection2(session, r, l, ft.getElementType());
+ Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new ObjectList(bc));
+ o = parseIntoCollection2(session, r, l, sType.getElementType());
}
- } else if (ft.canCreateNewInstanceFromObjectMap(outer)) {
+ } else if (sType.canCreateNewInstanceFromObjectMap(outer)) {
ObjectMap m = new ObjectMap(bc);
parseIntoMap2(session, r, m, string(), object());
- o = ft.newInstanceFromObjectMap(outer, m);
- } else if (ft.canCreateNewBean(outer)) {
- BeanMap m = bc.newBeanMap(outer, ft.getInnerClass());
+ o = sType.newInstanceFromObjectMap(outer, m);
+ } else if (sType.canCreateNewBean(outer)) {
+ BeanMap m = bc.newBeanMap(outer, sType.getInnerClass());
o = parseIntoBeanMap2(session, r, m).getBean();
- } else if (ft.canCreateNewInstanceFromString(outer) && (c == '\'' || c == '"')) {
- o = ft.newInstanceFromString(outer, parseString(session, r));
- } else if (ft.canCreateNewInstanceFromNumber(outer) && StringUtils.isFirstNumberChar((char)c)) {
- o = ft.newInstanceFromNumber(outer, parseNumber(session, r, ft.getNewInstanceFromNumberClass()));
- } else if (ft.isArray()) {
+ } else if (sType.canCreateNewInstanceFromString(outer) && (c == '\'' || c == '"')) {
+ o = sType.newInstanceFromString(outer, parseString(session, r));
+ } else if (sType.canCreateNewInstanceFromNumber(outer) && StringUtils.isFirstNumberChar((char)c)) {
+ o = sType.newInstanceFromNumber(outer, parseNumber(session, r, sType.getNewInstanceFromNumberClass()));
+ } else if (sType.isArray()) {
if (c == '{') {
ObjectMap m = new ObjectMap(bc);
parseIntoMap2(session, r, m, string(), object());
o = m.cast();
} else {
- ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), ft.getElementType());
- o = bc.toArray(ft, l);
+ ArrayList l = (ArrayList)parseIntoCollection2(session, r, new ArrayList(), sType.getElementType());
+ o = bc.toArray(sType, l);
}
} else if (c == '{') {
Map m = new ObjectMap(bc);
- parseIntoMap2(session, r, m, ft.getKeyType(), ft.getValueType());
+ parseIntoMap2(session, r, m, sType.getKeyType(), sType.getValueType());
if (m.containsKey("_class"))
o = ((ObjectMap)m).cast();
else
- throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", ft.getInnerClass().getName(), ft.getNotABeanReason());
- } else if (ft.canCreateNewInstanceFromString(outer) && ! session.isStrictMode()) {
- o = ft.newInstanceFromString(outer, parseString(session, r));
+ throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());
+ } else if (sType.canCreateNewInstanceFromString(outer) && ! session.isStrictMode()) {
+ o = sType.newInstanceFromString(outer, parseString(session, r));
} else {
- throw new ParseException(session, "Unrecognized syntax for class type ''{0}'', starting character ''{1}''", ft, (char)c);
+ throw new ParseException(session, "Unrecognized syntax for class type ''{0}'', starting character ''{1}''", sType, (char)c);
}
if (wrapperAttr != null)
skipWrapperAttrEnd(session, r);
if (transform != null && o != null)
- o = transform.unswap(o, nt, bc);
+ o = transform.unswap(o, eType, bc);
if (outer != null)
- setParent(nt, o, outer);
+ setParent(eType, o, outer);
return (T)o;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index 9104b49..a1df3cc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -90,22 +90,22 @@ public final class JsonSchemaSerializer extends JsonSerializer {
eType = object();
ClassMeta<?> aType; // The actual type (will be null if recursion occurs)
- ClassMeta<?> gType; // The generic type
+ ClassMeta<?> sType; // The serialized type
aType = session.push(attrName, eType, null);
- gType = eType.getSerializedClassMeta();
+ sType = eType.getSerializedClassMeta();
String type = null;
- if (gType.isEnum() || gType.isCharSequence() || gType.isChar())
+ if (sType.isEnum() || sType.isCharSequence() || sType.isChar())
type = "string";
- else if (gType.isNumber())
+ else if (sType.isNumber())
type = "number";
- else if (gType.isBoolean())
+ else if (sType.isBoolean())
type = "boolean";
- else if (gType.isBean() || gType.isMap())
+ else if (sType.isBean() || sType.isMap())
type = "object";
- else if (gType.isCollection() || gType.isArray())
+ else if (sType.isCollection() || sType.isArray())
type = "array";
else
type = "any";
@@ -117,16 +117,16 @@ public final class JsonSchemaSerializer extends JsonSerializer {
out.put("transform", f);
if (aType != null) {
- if (gType.isEnum())
- out.put("enum", getEnumStrings((Class<Enum<?>>)gType.getInnerClass()));
- else if (gType.isCollection() || gType.isArray()) {
- ClassMeta componentType = gType.getElementType();
- if (gType.isCollection() && isParentClass(Set.class, gType.getInnerClass()))
+ if (sType.isEnum())
+ out.put("enum", getEnumStrings((Class<Enum<?>>)sType.getInnerClass()));
+ else if (sType.isCollection() || sType.isArray()) {
+ ClassMeta componentType = sType.getElementType();
+ if (sType.isCollection() && isParentClass(Set.class, sType.getInnerClass()))
out.put("uniqueItems", true);
out.put("items", getSchema(session, componentType, "items", pNames));
- } else if (gType.isBean()) {
+ } else if (sType.isBean()) {
ObjectMap properties = new ObjectMap();
- BeanMeta bm = session.getBeanContext().getBeanMeta(gType.getInnerClass());
+ BeanMeta bm = session.getBeanContext().getBeanMeta(sType.getInnerClass());
if (pNames != null)
bm = new BeanMetaFiltered(bm, pNames);
for (Iterator<BeanPropertyMeta> i = bm.getPropertyMetas().iterator(); i.hasNext();) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java
index cb5297a..0493780 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -173,7 +173,7 @@ public class JsonSerializer extends WriterSerializer {
boolean addClassAttr; // Add "_class" attribute to element?
ClassMeta<?> aType; // The actual type
- ClassMeta<?> gType; // The generic type
+ ClassMeta<?> sType; // The serialized type
aType = session.push(attrName, o, eType);
boolean isRecursion = aType == null;
@@ -184,7 +184,7 @@ public class JsonSerializer extends WriterSerializer {
aType = object();
}
- gType = aType.getSerializedClassMeta();
+ sType = aType.getSerializedClassMeta();
addClassAttr = (session.isAddClassAttrs() && ! eType.equals(aType));
// Swap if necessary
@@ -194,44 +194,44 @@ public class JsonSerializer extends WriterSerializer {
// If the getSwapClass() method returns Object, we need to figure out
// the actual type now.
- if (gType.isObject())
- gType = bc.getClassMetaForObject(o);
+ if (sType.isObject())
+ sType = bc.getClassMetaForObject(o);
}
- String wrapperAttr = gType.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();
+ String wrapperAttr = sType.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();
if (wrapperAttr != null) {
out.append('{').cr(session.indent).attr(wrapperAttr).append(':').s();
session.indent++;
}
// '\0' characters are considered null.
- if (o == null || (gType.isChar() && ((Character)o).charValue() == 0))
+ if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))
out.append("null");
- else if (gType.isNumber() || gType.isBoolean())
+ else if (sType.isNumber() || sType.isBoolean())
out.append(o);
- else if (gType.hasToObjectMapMethod())
- serializeMap(session, out, gType.toObjectMap(o), gType);
- else if (gType.isBean())
+ else if (sType.hasToObjectMapMethod())
+ serializeMap(session, out, sType.toObjectMap(o), sType);
+ else if (sType.isBean())
serializeBeanMap(session, out, bc.forBean(o), addClassAttr);
- else if (gType.isUri() || (pMeta != null && pMeta.isUri()))
+ else if (sType.isUri() || (pMeta != null && pMeta.isUri()))
out.q().appendUri(o).q();
- else if (gType.isMap()) {
+ else if (sType.isMap()) {
if (o instanceof BeanMap)
serializeBeanMap(session, out, (BeanMap)o, addClassAttr);
else
serializeMap(session, out, (Map)o, eType);
}
- else if (gType.isCollection()) {
+ else if (sType.isCollection()) {
if (addClassAttr)
- serializeCollectionMap(session, out, (Collection)o, gType);
+ serializeCollectionMap(session, out, (Collection)o, sType);
else
serializeCollection(session, out, (Collection) o, eType);
}
- else if (gType.isArray()) {
+ else if (sType.isArray()) {
if (addClassAttr)
- serializeCollectionMap(session, out, toList(gType.getInnerClass(), o), gType);
+ serializeCollectionMap(session, out, toList(sType.getInnerClass(), o), sType);
else
- serializeCollection(session, out, toList(gType.getInnerClass(), o), eType);
+ serializeCollection(session, out, toList(sType.getInnerClass(), o), eType);
}
else
out.stringValue(session.toString(o));
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index bbda612..81b2547 100644
--- a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -51,14 +51,14 @@ public final class MsgPackParser extends InputStreamParser {
/**
* Workhorse method.
*/
- private <T> T parseAnything(MsgPackParserSession session, ClassMeta<T> nt, MsgPackInputStream is, Object outer) throws Exception {
+ private <T> T parseAnything(MsgPackParserSession session, ClassMeta<T> eType, MsgPackInputStream is, Object outer) throws Exception {
BeanContext bc = session.getBeanContext();
- if (nt == null)
- nt = (ClassMeta<T>)object();
- PojoSwap<T,Object> transform = (PojoSwap<T,Object>)nt.getPojoSwap();
- ClassMeta<?> ft = nt.getSerializedClassMeta();
- session.setCurrentClass(ft);
+ if (eType == null)
+ eType = (ClassMeta<T>)object();
+ PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();
+ ClassMeta<?> sType = eType.getSerializedClassMeta();
+ session.setCurrentClass(sType);
Object o = null;
DataType dt = is.readDataType();
@@ -79,44 +79,44 @@ public final class MsgPackParser extends InputStreamParser {
o = session.trim(is.readString());
else if (dt == BIN)
o = is.readBinary();
- else if (dt == ARRAY && ft.isObject()) {
+ else if (dt == ARRAY && sType.isObject()) {
ObjectList ol = new ObjectList(bc);
for (int i = 0; i < length; i++)
ol.add(parseAnything(session, object(), is, outer));
o = ol;
- } else if (dt == MAP && ft.isObject()) {
+ } else if (dt == MAP && sType.isObject()) {
ObjectMap om = new ObjectMap(bc);
for (int i = 0; i < length; i++)
om.put(parseAnything(session, string(), is, outer), parseAnything(session, object(), is, om));
o = om.cast();
}
- if (ft.isObject()) {
+ if (sType.isObject()) {
// Do nothing.
- } else if (ft.isBoolean() || ft.isCharSequence() || ft.isChar() || ft.isNumber()) {
- o = bc.convertToType(o, ft);
- } else if (ft.isMap()) {
+ } else if (sType.isBoolean() || sType.isCharSequence() || sType.isChar() || sType.isNumber()) {
+ o = bc.convertToType(o, sType);
+ } else if (sType.isMap()) {
if (dt == MAP) {
- Map m = (ft.canCreateNewInstance(outer) ? (Map)ft.newInstance(outer) : new ObjectMap(bc));
+ Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(bc));
for (int i = 0; i < length; i++) {
- Object key = parseAnything(session, ft.getKeyType(), is, outer);
- ClassMeta<?> vt = ft.getValueType();
+ Object key = parseAnything(session, sType.getKeyType(), is, outer);
+ ClassMeta<?> vt = sType.getValueType();
Object value = parseAnything(session, vt, is, m);
setName(vt, value, key);
m.put(key, value);
}
o = m;
} else {
- throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, ft);
+ throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, sType);
}
- } else if (ft.canCreateNewInstanceFromObjectMap(outer)) {
+ } else if (sType.canCreateNewInstanceFromObjectMap(outer)) {
ObjectMap m = new ObjectMap(bc);
for (int i = 0; i < length; i++)
m.put(parseAnything(session, string(), is, outer), parseAnything(session, object(), is, m));
- o = ft.newInstanceFromObjectMap(outer, m);
- } else if (ft.canCreateNewBean(outer)) {
+ o = sType.newInstanceFromObjectMap(outer, m);
+ } else if (sType.canCreateNewBean(outer)) {
if (dt == MAP) {
- BeanMap m = bc.newBeanMap(outer, ft.getInnerClass());
+ BeanMap m = bc.newBeanMap(outer, sType.getInnerClass());
for (int i = 0; i < length; i++) {
String pName = parseAnything(session, string(), is, m.getBean(false));
BeanPropertyMeta bpm = m.getPropertyMeta(pName);
@@ -134,39 +134,39 @@ public final class MsgPackParser extends InputStreamParser {
}
o = m.getBean();
} else {
- throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, ft);
+ throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, sType);
}
- } else if (ft.canCreateNewInstanceFromString(outer) && dt == STRING) {
- o = ft.newInstanceFromString(outer, o == null ? "" : o.toString());
- } else if (ft.canCreateNewInstanceFromNumber(outer) && dt.isOneOf(INT, LONG, FLOAT, DOUBLE)) {
- o = ft.newInstanceFromNumber(outer, (Number)o);
- } else if (ft.isCollection()) {
+ } else if (sType.canCreateNewInstanceFromString(outer) && dt == STRING) {
+ o = sType.newInstanceFromString(outer, o == null ? "" : o.toString());
+ } else if (sType.canCreateNewInstanceFromNumber(outer) && dt.isOneOf(INT, LONG, FLOAT, DOUBLE)) {
+ o = sType.newInstanceFromNumber(outer, (Number)o);
+ } else if (sType.isCollection()) {
if (dt == MAP) {
ObjectMap m = new ObjectMap(bc);
for (int i = 0; i < length; i++)
m.put(parseAnything(session, string(), is, outer), parseAnything(session, object(), is, m));
o = m.cast();
} else if (dt == ARRAY) {
- Collection l = (ft.canCreateNewInstance(outer) ? (Collection)ft.newInstance() : new ObjectList(bc));
+ Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new ObjectList(bc));
for (int i = 0; i < length; i++)
- l.add(parseAnything(session, ft.getElementType(), is, l));
+ l.add(parseAnything(session, sType.getElementType(), is, l));
o = l;
} else {
- throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, ft);
+ throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, sType);
}
- } else if (ft.isArray()) {
+ } else if (sType.isArray()) {
if (dt == MAP) {
ObjectMap m = new ObjectMap(bc);
for (int i = 0; i < length; i++)
m.put(parseAnything(session, string(), is, outer), parseAnything(session, object(), is, m));
o = m.cast();
} else if (dt == ARRAY) {
- Collection l = (ft.isCollection() && ft.canCreateNewInstance(outer) ? (Collection)ft.newInstance() : new ObjectList(bc));
+ Collection l = (sType.isCollection() && sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance() : new ObjectList(bc));
for (int i = 0; i < length; i++)
- l.add(parseAnything(session, ft.getElementType(), is, l));
- o = bc.toArray(ft, l);
+ l.add(parseAnything(session, sType.getElementType(), is, l));
+ o = bc.toArray(sType, l);
} else {
- throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, ft);
+ throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, sType);
}
} else if (dt == MAP) {
ObjectMap m = new ObjectMap(bc);
@@ -175,17 +175,17 @@ public final class MsgPackParser extends InputStreamParser {
if (m.containsKey("_class"))
o = m.cast();
else
- throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", ft.getInnerClass().getName(), ft.getNotABeanReason());
+ throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());
} else {
- throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, ft);
+ throw new ParseException(session, "Invalid data type {0} encountered for parse type {1}", dt, sType);
}
}
if (transform != null && o != null)
- o = transform.unswap(o, nt, bc);
+ o = transform.unswap(o, eType, bc);
if (outer != null)
- setParent(nt, o, outer);
+ setParent(eType, o, outer);
return (T)o;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index ac141e3..b60b992 100644
--- a/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -63,7 +63,7 @@ public class MsgPackSerializer extends OutputStreamSerializer {
boolean addClassAttr; // Add "_class" attribute to element?
ClassMeta<?> aType; // The actual type
- ClassMeta<?> gType; // The generic type
+ ClassMeta<?> sType; // The serialized type
aType = session.push(attrName, o, eType);
boolean isRecursion = aType == null;
@@ -74,7 +74,7 @@ public class MsgPackSerializer extends OutputStreamSerializer {
aType = object();
}
- gType = aType.getSerializedClassMeta();
+ sType = aType.getSerializedClassMeta();
addClassAttr = (session.isAddClassAttrs() && ! eType.equals(aType));
// Swap if necessary
@@ -84,40 +84,40 @@ public class MsgPackSerializer extends OutputStreamSerializer {
// If the getSwapClass() method returns Object, we need to figure out
// the actual type now.
- if (gType.isObject())
- gType = bc.getClassMetaForObject(o);
+ if (sType.isObject())
+ sType = bc.getClassMetaForObject(o);
}
// '\0' characters are considered null.
- if (o == null || (gType.isChar() && ((Character)o).charValue() == 0))
+ if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))
out.appendNull();
- else if (gType.isBoolean())
+ else if (sType.isBoolean())
out.appendBoolean((Boolean)o);
- else if (gType.isNumber())
+ else if (sType.isNumber())
out.appendNumber((Number)o);
- else if (gType.hasToObjectMapMethod())
- serializeMap(session, out, gType.toObjectMap(o), gType);
- else if (gType.isBean())
+ else if (sType.hasToObjectMapMethod())
+ serializeMap(session, out, sType.toObjectMap(o), sType);
+ else if (sType.isBean())
serializeBeanMap(session, out, bc.forBean(o), addClassAttr);
- else if (gType.isUri() || (pMeta != null && pMeta.isUri()))
+ else if (sType.isUri() || (pMeta != null && pMeta.isUri()))
out.appendString(session.resolveUri(o.toString()));
- else if (gType.isMap()) {
+ else if (sType.isMap()) {
if (o instanceof BeanMap)
serializeBeanMap(session, out, (BeanMap)o, addClassAttr);
else
serializeMap(session, out, (Map)o, eType);
}
- else if (gType.isCollection()) {
+ else if (sType.isCollection()) {
if (addClassAttr)
- serializeCollectionMap(session, out, (Collection)o, gType);
+ serializeCollectionMap(session, out, (Collection)o, sType);
else
serializeCollection(session, out, (Collection) o, eType);
}
- else if (gType.isArray()) {
+ else if (sType.isArray()) {
if (addClassAttr)
- serializeCollectionMap(session, out, toList(gType.getInnerClass(), o), gType);
+ serializeCollectionMap(session, out, toList(sType.getInnerClass(), o), sType);
else
- serializeCollection(session, out, toList(gType.getInnerClass(), o), eType);
+ serializeCollection(session, out, toList(sType.getInnerClass(), o), eType);
} else
out.appendString(session.toString(o));
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java b/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
index b21f63b..c3c6b30 100644
--- a/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/parser/Parser.java
@@ -580,21 +580,21 @@ public abstract class Parser extends CoreApi {
if (type == null)
type = (ClassMeta<T>)object();
PojoSwap transform = type.getPojoSwap();
- ClassMeta<?> gType = type.getSerializedClassMeta();
+ ClassMeta<?> sType = type.getSerializedClassMeta();
Object o = s;
- if (gType.isChar())
+ if (sType.isChar())
o = s.charAt(0);
- else if (gType.isNumber())
+ else if (sType.isNumber())
if (type.canCreateNewInstanceFromNumber(outer))
o = type.newInstanceFromNumber(outer, parseNumber(s, type.getNewInstanceFromNumberClass()));
else
- o = parseNumber(s, (Class<? extends Number>)gType.getInnerClass());
- else if (gType.isBoolean())
+ o = parseNumber(s, (Class<? extends Number>)sType.getInnerClass());
+ else if (sType.isBoolean())
o = Boolean.parseBoolean(s);
- else if (! (gType.isCharSequence() || gType.isObject())) {
- if (gType.canCreateNewInstanceFromString(outer))
- o = gType.newInstanceFromString(outer, s);
+ else if (! (sType.isCharSequence() || sType.isObject())) {
+ if (sType.canCreateNewInstanceFromString(outer))
+ o = sType.newInstanceFromString(outer, s);
else
throw new ParseException(session, "Invalid conversion from string to class ''{0}''", type);
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index ea56d52..ce423cc 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -743,18 +743,18 @@ public class SerializerSession extends Session {
/**
* Create a "_class" property that represents the name of the bean.
- *
- * @param m
+ *
+ * @param m
* The bean map to create a class property on.
- * @param lexicon
- * The bean/pojo lexicon map to use to resolve the name of the bean class.
- * @return
+ * @param typeDictionary
+ * The bean dictionary map to use to resolve the name of the bean class.
+ * @return
* A new bean property value.
*/
- public BeanPropertyValue createBeanClassProperty(BeanMap<?> m, ClassLexicon lexicon) {
+ public BeanPropertyValue createBeanClassProperty(BeanMap<?> m, TypeDictionary typeDictionary) {
BeanMeta<?> bm = m.getMeta();
Class<?> c = bm.getClassMeta().getInnerClass();
- String name = (lexicon == null ? null : lexicon.getNameForClass(c));
+ String name = (typeDictionary == null ? null : typeDictionary.getNameForClass(c));
if (name == null)
name = c.getName();
return new BeanPropertyValue(bm.getClassProperty(), name, null);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/transform/AnnotationBeanFilter.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/AnnotationBeanFilter.java b/juneau-core/src/main/java/org/apache/juneau/transform/AnnotationBeanFilter.java
index fef0331..467a2c3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/AnnotationBeanFilter.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/AnnotationBeanFilter.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -38,7 +38,7 @@ public final class AnnotationBeanFilter<T> extends BeanFilter<T> {
}
private AnnotationBeanFilter(Builder<T> b) {
- super(b.beanClass, b.properties, b.excludeProperties, b.interfaceClass, b.stopClass, b.sortProperties, b.propertyNamer, b.classLexicon, b.subTypeProperty, b.subTypes);
+ super(b.beanClass, b.properties, b.excludeProperties, b.interfaceClass, b.stopClass, b.sortProperties, b.propertyNamer, b.typeDictionary, b.subTypeProperty, b.subTypes);
}
private static class Builder<T> {
@@ -49,7 +49,7 @@ public final class AnnotationBeanFilter<T> extends BeanFilter<T> {
Class<?> stopClass;
boolean sortProperties;
PropertyNamer propertyNamer;
- ClassLexicon classLexicon;
+ TypeDictionary typeDictionary;
String subTypeProperty;
LinkedHashMap<Class<?>,String> subTypes = new LinkedHashMap<Class<?>,String>();
@@ -81,20 +81,17 @@ public final class AnnotationBeanFilter<T> extends BeanFilter<T> {
if (b.stopClass() != Object.class)
stopClass = b.stopClass();
- if (b.classLexicon().length > 0)
- classLexicon = new ClassLexicon(b.classLexicon());
+ if (b.typeDictionary().length > 0)
+ typeDictionary = new TypeDictionary(b.typeDictionary());
if (b.subTypes().length > 0) {
subTypeProperty = b.subTypeProperty();
for (Class<?> bst : b.subTypes()) {
Bean b2 = bst.getAnnotation(Bean.class);
- Pojo p2 = bst.getAnnotation(Pojo.class);
String name = null;
- if (! b2.name().isEmpty())
- name = b2.name();
- else if (! p2.name().isEmpty())
- name = p2.name();
+ if (! b2.typeName().isEmpty())
+ name = b2.typeName();
else
name = bst.getName();
subTypes.put(bst, name);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java
index 50c5c9c..e8b90ed 100644
--- a/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java
+++ b/juneau-core/src/main/java/org/apache/juneau/transform/BeanFilter.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -73,7 +73,7 @@ public abstract class BeanFilter<T> {
private final PropertyNamer propertyNamer;
private final Class<?> interfaceClass, stopClass;
private final boolean sortProperties;
- private final ClassLexicon classLexicon;
+ private final TypeDictionary typeDictionary;
/**
* Constructor.
@@ -144,8 +144,8 @@ public abstract class BeanFilter<T> {
* Sort properties in alphabetical order.
* @param propertyNamer
* The property namer to use to name bean properties.
- * @param classLexicon
- * The class lexicon to use for resolving class identifier names from classes.
+ * @param typeDictionary
+ * The class dictionary to use for resolving class identifier names from classes.
* @param subTypeProperty
* Defines a virtual property on a superclass that identifies bean subtype classes.
* <p>
@@ -200,7 +200,7 @@ public abstract class BeanFilter<T> {
* @param subTypes
*/
@SuppressWarnings("unchecked")
- public BeanFilter(Class<T> beanClass, String[] properties, String[] excludeProperties, Class<?> interfaceClass, Class<?> stopClass, boolean sortProperties, PropertyNamer propertyNamer, ClassLexicon classLexicon, String subTypeProperty, Map<Class<?>,String> subTypes) {
+ public BeanFilter(Class<T> beanClass, String[] properties, String[] excludeProperties, Class<?> interfaceClass, Class<?> stopClass, boolean sortProperties, PropertyNamer propertyNamer, TypeDictionary typeDictionary, String subTypeProperty, Map<Class<?>,String> subTypes) {
if (beanClass == null) {
Class<?> c = this.getClass().getSuperclass();
@@ -232,7 +232,7 @@ public abstract class BeanFilter<T> {
this.stopClass = stopClass;
this.sortProperties = sortProperties;
this.propertyNamer = propertyNamer;
- this.classLexicon = classLexicon;
+ this.typeDictionary = typeDictionary;
this.subTypeAttr = subTypeProperty;
this.subTypes = subTypes == null ? null : Collections.unmodifiableMap(subTypes);
}
@@ -319,12 +319,12 @@ public abstract class BeanFilter<T> {
}
/**
- * Returns the class lexicon to use for this bean.
+ * Returns the class dictionary to use for this bean.
*
- * @return The class lexicon to use for this bean.
+ * @return The class dictionary to use for this bean.
*/
- public ClassLexicon getClassLexicon() {
- return classLexicon;
+ public TypeDictionary getTypeDictionary() {
+ return typeDictionary;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
index 27e47fd..6dcb026 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonParser.java
@@ -81,20 +81,20 @@ public class UonParser extends ReaderParser {
* Workhorse method.
*
* @param session The parser context for this parse.
- * @param nt The class type being parsed, or <jk>null</jk> if unknown.
+ * @param eType The class type being parsed, or <jk>null</jk> if unknown.
* @param r The reader being parsed.
* @param outer The outer object (for constructing nested inner classes).
* @param isUrlParamValue If <jk>true</jk>, then we're parsing a top-level URL-encoded value which is treated a bit different than the default case.
* @return The parsed object.
* @throws Exception
*/
- protected <T> T parseAnything(UonParserSession session, ClassMeta<T> nt, ParserReader r, Object outer, boolean isUrlParamValue) throws Exception {
+ protected <T> T parseAnything(UonParserSession session, ClassMeta<T> eType, ParserReader r, Object outer, boolean isUrlParamValue) throws Exception {
BeanContext bc = session.getBeanContext();
- if (nt == null)
- nt = (ClassMeta<T>)object();
- PojoSwap<T,Object> transform = (PojoSwap<T,Object>)nt.getPojoSwap();
- ClassMeta<?> ft = nt.getSerializedClassMeta();
+ if (eType == null)
+ eType = (ClassMeta<T>)object();
+ PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();
+ ClassMeta<?> sType = eType.getSerializedClassMeta();
Object o = null;
@@ -105,14 +105,14 @@ public class UonParser extends ReaderParser {
if (c == -1 || c == AMP) {
// If parameter is blank and it's an array or collection, return an empty list.
- if (ft.isArray() || ft.isCollection())
- o = ft.newInstance();
- else if (ft.isString() || ft.isObject())
+ if (sType.isArray() || sType.isCollection())
+ o = sType.newInstance();
+ else if (sType.isString() || sType.isObject())
o = "";
- else if (ft.isPrimitive())
- o = ft.getPrimitiveDefault();
+ else if (sType.isPrimitive())
+ o = sType.getPrimitiveDefault();
// Otherwise, leave null.
- } else if (ft.isObject()) {
+ } else if (sType.isObject()) {
if (flag == 0 || flag == 's') {
o = parseString(session, r, isUrlParamValue);
} else if (flag == 'b') {
@@ -125,23 +125,23 @@ public class UonParser extends ReaderParser {
o = m.cast();
} else if (flag == 'a') {
Collection l = new ObjectList(bc);
- o = parseIntoCollection(session, r, l, ft.getElementType(), isUrlParamValue);
+ o = parseIntoCollection(session, r, l, sType.getElementType(), isUrlParamValue);
} else {
throw new ParseException(session, "Unexpected flag character ''{0}''.", flag);
}
- } else if (ft.isBoolean()) {
+ } else if (sType.isBoolean()) {
o = parseBoolean(session, r);
- } else if (ft.isCharSequence()) {
+ } else if (sType.isCharSequence()) {
o = parseString(session, r, isUrlParamValue);
- } else if (ft.isChar()) {
+ } else if (sType.isChar()) {
String s = parseString(session, r, isUrlParamValue);
o = s == null ? null : s.charAt(0);
- } else if (ft.isNumber()) {
- o = parseNumber(session, r, (Class<? extends Number>)ft.getInnerClass());
- } else if (ft.isMap()) {
- Map m = (ft.canCreateNewInstance(outer) ? (Map)ft.newInstance(outer) : new ObjectMap(bc));
- o = parseIntoMap(session, r, m, ft.getKeyType(), ft.getValueType());
- } else if (ft.isCollection()) {
+ } else if (sType.isNumber()) {
+ o = parseNumber(session, r, (Class<? extends Number>)sType.getInnerClass());
+ } else if (sType.isMap()) {
+ Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(bc));
+ o = parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType());
+ } else if (sType.isCollection()) {
if (flag == 'o') {
ObjectMap m = new ObjectMap(bc);
parseIntoMap(session, r, m, string(), object());
@@ -150,29 +150,29 @@ public class UonParser extends ReaderParser {
o = m.cast();
// Handle case where it's a collection, but only a single value was specified.
else {
- Collection l = (ft.canCreateNewInstance(outer) ? (Collection)ft.newInstance(outer) : new ObjectList(bc));
- l.add(m.cast(ft.getElementType()));
+ Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance(outer) : new ObjectList(bc));
+ l.add(m.cast(sType.getElementType()));
o = l;
}
} else {
- Collection l = (ft.canCreateNewInstance(outer) ? (Collection)ft.newInstance(outer) : new ObjectList(bc));
- o = parseIntoCollection(session, r, l, ft.getElementType(), isUrlParamValue);
+ Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance(outer) : new ObjectList(bc));
+ o = parseIntoCollection(session, r, l, sType.getElementType(), isUrlParamValue);
}
- } else if (ft.canCreateNewInstanceFromObjectMap(outer)) {
+ } else if (sType.canCreateNewInstanceFromObjectMap(outer)) {
ObjectMap m = new ObjectMap(bc);
parseIntoMap(session, r, m, string(), object());
- o = ft.newInstanceFromObjectMap(outer, m);
- } else if (ft.canCreateNewBean(outer)) {
- BeanMap m = bc.newBeanMap(outer, ft.getInnerClass());
+ o = sType.newInstanceFromObjectMap(outer, m);
+ } else if (sType.canCreateNewBean(outer)) {
+ BeanMap m = bc.newBeanMap(outer, sType.getInnerClass());
m = parseIntoBeanMap(session, r, m);
o = m == null ? null : m.getBean();
- } else if (ft.canCreateNewInstanceFromString(outer)) {
+ } else if (sType.canCreateNewInstanceFromString(outer)) {
String s = parseString(session, r, isUrlParamValue);
if (s != null)
- o = ft.newInstanceFromString(outer, s);
- } else if (ft.canCreateNewInstanceFromNumber(outer)) {
- o = ft.newInstanceFromNumber(outer, parseNumber(session, r, ft.getNewInstanceFromNumberClass()));
- } else if (ft.isArray()) {
+ o = sType.newInstanceFromString(outer, s);
+ } else if (sType.canCreateNewInstanceFromNumber(outer)) {
+ o = sType.newInstanceFromNumber(outer, parseNumber(session, r, sType.getNewInstanceFromNumberClass()));
+ } else if (sType.isArray()) {
if (flag == 'o') {
ObjectMap m = new ObjectMap(bc);
parseIntoMap(session, r, m, string(), object());
@@ -182,12 +182,12 @@ public class UonParser extends ReaderParser {
// Handle case where it's an array, but only a single value was specified.
else {
ArrayList l = new ArrayList(1);
- l.add(m.cast(ft.getElementType()));
- o = bc.toArray(ft, l);
+ l.add(m.cast(sType.getElementType()));
+ o = bc.toArray(sType, l);
}
} else {
- ArrayList l = (ArrayList)parseIntoCollection(session, r, new ArrayList(), ft.getElementType(), isUrlParamValue);
- o = bc.toArray(ft, l);
+ ArrayList l = (ArrayList)parseIntoCollection(session, r, new ArrayList(), sType.getElementType(), isUrlParamValue);
+ o = bc.toArray(sType, l);
}
} else if (flag == 'o') {
// It could be a non-bean with _class attribute.
@@ -196,16 +196,16 @@ public class UonParser extends ReaderParser {
if (m.containsKey("_class"))
o = m.cast();
else
- throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", ft.getInnerClass().getName(), ft.getNotABeanReason());
+ throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());
} else {
- throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", ft.getInnerClass().getName(), ft.getNotABeanReason());
+ throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());
}
if (transform != null && o != null)
- o = transform.unswap(o, nt, bc);
+ o = transform.unswap(o, eType, bc);
if (outer != null)
- setParent(nt, o, outer);
+ setParent(eType, o, outer);
return (T)o;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java
index 1c76e6c..cb64be7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UonSerializer.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -259,7 +259,7 @@ public class UonSerializer extends WriterSerializer {
boolean addClassAttr; // Add "_class" attribute to element?
ClassMeta<?> aType; // The actual type
- ClassMeta<?> gType; // The generic type
+ ClassMeta<?> sType; // The serialized type
aType = session.push(attrName, o, eType);
boolean isRecursion = aType == null;
@@ -270,7 +270,7 @@ public class UonSerializer extends WriterSerializer {
aType = object();
}
- gType = aType.getSerializedClassMeta();
+ sType = aType.getSerializedClassMeta();
addClassAttr = (session.isAddClassAttrs() && ! eType.equals(aType));
// Swap if necessary
@@ -280,36 +280,36 @@ public class UonSerializer extends WriterSerializer {
// If the getSwapClass() method returns Object, we need to figure out
// the actual type now.
- if (gType.isObject())
- gType = bc.getClassMetaForObject(o);
+ if (sType.isObject())
+ sType = bc.getClassMetaForObject(o);
}
// '\0' characters are considered null.
- if (o == null || (gType.isChar() && ((Character)o).charValue() == 0))
+ if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))
out.appendObject(null, false, false, isTop);
- else if (gType.hasToObjectMapMethod())
- serializeMap(session, out, gType.toObjectMap(o), eType);
- else if (gType.isBean())
+ else if (sType.hasToObjectMapMethod())
+ serializeMap(session, out, sType.toObjectMap(o), eType);
+ else if (sType.isBean())
serializeBeanMap(session, out, bc.forBean(o), addClassAttr);
- else if (gType.isUri() || (pMeta != null && pMeta.isUri()))
+ else if (sType.isUri() || (pMeta != null && pMeta.isUri()))
out.appendUri(o, isTop);
- else if (gType.isMap()) {
+ else if (sType.isMap()) {
if (o instanceof BeanMap)
serializeBeanMap(session, out, (BeanMap)o, addClassAttr);
else
serializeMap(session, out, (Map)o, eType);
}
- else if (gType.isCollection()) {
+ else if (sType.isCollection()) {
if (addClassAttr)
- serializeCollectionMap(session, out, (Collection)o, gType);
+ serializeCollectionMap(session, out, (Collection)o, sType);
else
serializeCollection(session, out, (Collection) o, eType);
}
- else if (gType.isArray()) {
+ else if (sType.isArray()) {
if (addClassAttr)
- serializeCollectionMap(session, out, toList(gType.getInnerClass(), o), gType);
+ serializeCollectionMap(session, out, toList(sType.getInnerClass(), o), sType);
else
- serializeCollection(session, out, toList(gType.getInnerClass(), o), eType);
+ serializeCollection(session, out, toList(sType.getInnerClass(), o), eType);
}
else {
out.appendObject(o, quoteEmptyStrings, false, isTop);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 590581e..285604d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -69,13 +69,13 @@ public class UrlEncodingParser extends UonParser {
setProperty(UON_decodeChars, true);
}
- private <T> T parseAnything(UrlEncodingParserSession session, ClassMeta<T> nt, ParserReader r, Object outer) throws Exception {
+ private <T> T parseAnything(UrlEncodingParserSession session, ClassMeta<T> eType, ParserReader r, Object outer) throws Exception {
BeanContext bc = session.getBeanContext();
- if (nt == null)
- nt = (ClassMeta<T>)object();
- PojoSwap<T,Object> transform = (PojoSwap<T,Object>)nt.getPojoSwap();
- ClassMeta<?> ft = nt.getSerializedClassMeta();
+ if (eType == null)
+ eType = (ClassMeta<T>)object();
+ PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();
+ ClassMeta<?> sType = eType.getSerializedClassMeta();
int c = r.peek();
if (c == '?')
@@ -83,19 +83,19 @@ public class UrlEncodingParser extends UonParser {
Object o;
- if (ft.isObject()) {
+ if (sType.isObject()) {
ObjectMap m = new ObjectMap(bc);
parseIntoMap(session, r, m, bc.string(), bc.object());
o = m.cast();
- } else if (ft.isMap()) {
- Map m = (ft.canCreateNewInstance() ? (Map)ft.newInstance() : new ObjectMap(bc));
- o = parseIntoMap(session, r, m, ft.getKeyType(), ft.getValueType());
- } else if (ft.canCreateNewInstanceFromObjectMap(outer)) {
+ } else if (sType.isMap()) {
+ Map m = (sType.canCreateNewInstance() ? (Map)sType.newInstance() : new ObjectMap(bc));
+ o = parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType());
+ } else if (sType.canCreateNewInstanceFromObjectMap(outer)) {
ObjectMap m = new ObjectMap(bc);
parseIntoMap(session, r, m, string(), object());
- o = ft.newInstanceFromObjectMap(outer, m);
- } else if (ft.canCreateNewBean(outer)) {
- BeanMap m = bc.newBeanMap(outer, ft.getInnerClass());
+ o = sType.newInstanceFromObjectMap(outer, m);
+ } else if (sType.canCreateNewBean(outer)) {
+ BeanMap m = bc.newBeanMap(outer, sType.getInnerClass());
m = parseIntoBeanMap(session, r, m);
o = m == null ? null : m.getBean();
} else {
@@ -106,30 +106,30 @@ public class UrlEncodingParser extends UonParser {
if (m.containsKey("_class"))
o = m.cast();
else if (m.containsKey("_value"))
- o = session.getBeanContext().convertToType(m.get("_value"), ft);
- else if (ft.isCollection()) {
+ o = session.getBeanContext().convertToType(m.get("_value"), sType);
+ else if (sType.isCollection()) {
// ?1=foo&2=bar...
- Collection c2 = ft.canCreateNewInstance() ? (Collection)ft.newInstance() : new ObjectList(bc);
+ Collection c2 = sType.canCreateNewInstance() ? (Collection)sType.newInstance() : new ObjectList(bc);
Map<Integer,Object> t = new TreeMap<Integer,Object>();
for (Map.Entry<String,Object> e : m.entrySet()) {
String k = e.getKey();
if (StringUtils.isNumeric(k))
- t.put(Integer.valueOf(k), bc.convertToType(e.getValue(), ft.getElementType()));
+ t.put(Integer.valueOf(k), bc.convertToType(e.getValue(), sType.getElementType()));
}
c2.addAll(t.values());
o = c2;
} else {
- if (ft.getNotABeanReason() != null)
- throw new ParseException(session, "Class ''{0}'' could not be instantiated as application/x-www-form-urlencoded. Reason: ''{1}''", ft, ft.getNotABeanReason());
- throw new ParseException(session, "Malformed application/x-www-form-urlencoded input for class ''{0}''.", ft);
+ if (sType.getNotABeanReason() != null)
+ throw new ParseException(session, "Class ''{0}'' could not be instantiated as application/x-www-form-urlencoded. Reason: ''{1}''", sType, sType.getNotABeanReason());
+ throw new ParseException(session, "Malformed application/x-www-form-urlencoded input for class ''{0}''.", sType);
}
}
if (transform != null && o != null)
- o = transform.unswap(o, nt, bc);
+ o = transform.unswap(o, eType, bc);
if (outer != null)
- setParent(nt, o, outer);
+ setParent(eType, o, outer);
return (T)o;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index 7b4c513..949863a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -230,14 +230,14 @@ public class UrlEncodingSerializer extends UonSerializer {
boolean addClassAttr; // Add "_class" attribute to element?
ClassMeta<?> aType; // The actual type
- ClassMeta<?> gType; // The generic type
+ ClassMeta<?> sType; // The serialized type
aType = session.push("root", o, object());
session.indent--;
if (aType == null)
aType = object();
- gType = aType.getSerializedClassMeta();
+ sType = aType.getSerializedClassMeta();
addClassAttr = (session.isAddClassAttrs());
// Swap if necessary
@@ -247,21 +247,21 @@ public class UrlEncodingSerializer extends UonSerializer {
// If the getSwapClass() method returns Object, we need to figure out
// the actual type now.
- if (gType.isObject())
- gType = bc.getClassMetaForObject(o);
+ if (sType.isObject())
+ sType = bc.getClassMetaForObject(o);
}
- if (gType.isMap()) {
+ if (sType.isMap()) {
if (o instanceof BeanMap)
serializeBeanMap(session, out, (BeanMap)o, addClassAttr);
else
- serializeMap(session, out, (Map)o, gType);
- } else if (gType.hasToObjectMapMethod()) {
- serializeMap(session, out, gType.toObjectMap(o), gType);
- } else if (gType.isBean()) {
+ serializeMap(session, out, (Map)o, sType);
+ } else if (sType.hasToObjectMapMethod()) {
+ serializeMap(session, out, sType.toObjectMap(o), sType);
+ } else if (sType.isBean()) {
serializeBeanMap(session, out, bc.forBean(o), addClassAttr);
- } else if (gType.isCollection()) {
- serializeMap(session, out, getCollectionMap((Collection)o), bc.getMapClassMeta(Map.class, Integer.class, gType.getElementType()));
+ } else if (sType.isCollection()) {
+ serializeMap(session, out, getCollectionMap((Collection)o), bc.getMapClassMeta(Map.class, Integer.class, sType.getElementType()));
} else {
// All other types can't be serialized as key/value pairs, so we create a
// mock key/value pair with a "_value" key.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
index 5a32382..f95d538 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlBeanPropertyMeta.java
@@ -124,14 +124,14 @@ public class XmlBeanPropertyMeta extends BeanPropertyMetaExtended {
if (cen.isEmpty())
cen = cmProperty.getExtendedMeta(XmlClassMeta.class).getChildName();
if (cen == null || cen.isEmpty())
- cen = cmProperty.getElementType().getLexiconName();
+ cen = cmProperty.getElementType().getDictionaryName();
if (cen == null || cen.isEmpty())
cen = name;
} else {
throw new BeanRuntimeException(cmBean.getInnerClass(), "Annotation error on property ''{0}''. @Xml.format=COLLAPSED can only be specified on collections and arrays.", name);
}
if (cen.isEmpty() && isCollection)
- cen = cmProperty.getLexiconName();
+ cen = cmProperty.getDictionaryName();
}
try {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
index 6c388f2..d8e1e82 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -62,14 +62,14 @@ public class XmlParser extends ReaderParser {
private static final int UNKNOWN=0, OBJECT=1, ARRAY=2, STRING=3, NUMBER=4, BOOLEAN=5, NULL=6;
- private <T> T parseAnything(XmlParserSession session, ClassMeta<T> nt, String currAttr, XMLStreamReader r, Object outer, boolean isRoot) throws Exception {
+ private <T> T parseAnything(XmlParserSession session, ClassMeta<T> eType, String currAttr, XMLStreamReader r, Object outer, boolean isRoot) throws Exception {
BeanContext bc = session.getBeanContext();
- if (nt == null)
- nt = (ClassMeta<T>)object();
- PojoSwap<T,Object> transform = (PojoSwap<T,Object>)nt.getPojoSwap();
- ClassMeta<?> ft = nt.getSerializedClassMeta();
- session.setCurrentClass(ft);
+ if (eType == null)
+ eType = (ClassMeta<T>)object();
+ PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();
+ ClassMeta<?> sType = eType.getSerializedClassMeta();
+ session.setCurrentClass(sType);
String wrapperAttr = (isRoot && session.isPreserveRootElement()) ? r.getName().getLocalPart() : null;
String typeAttr = r.getAttributeValue(null, "type");
@@ -85,10 +85,10 @@ public class XmlParser extends ReaderParser {
else
jsonType = getJsonType(elementName);
}
- if (! ft.canCreateNewInstance(outer)) {
+ if (! sType.canCreateNewInstance(outer)) {
String c = r.getAttributeValue(null, "_class");
if (c != null) {
- ft = nt = (ClassMeta<T>)bc.getClassMetaFromString(c);
+ sType = eType = (ClassMeta<T>)bc.getClassMetaFromString(c);
}
}
Object o = null;
@@ -105,7 +105,7 @@ public class XmlParser extends ReaderParser {
}
}
- if (ft.isObject()) {
+ if (sType.isObject()) {
if (jsonType == OBJECT) {
ObjectMap m = new ObjectMap(bc);
parseIntoMap(session, r, m, string(), object());
@@ -116,7 +116,7 @@ public class XmlParser extends ReaderParser {
o = parseIntoCollection(session, r, new ObjectList(bc), object());
else if (jsonType == STRING) {
o = session.decodeString(r.getElementText());
- if (ft.isChar())
+ if (sType.isChar())
o = o.toString().charAt(0);
}
else if (jsonType == NUMBER)
@@ -125,30 +125,30 @@ public class XmlParser extends ReaderParser {
o = Boolean.parseBoolean(session.decodeLiteral(r.getElementText()));
else if (jsonType == UNKNOWN)
o = getUnknown(session, r);
- } else if (ft.isBoolean()) {
+ } else if (sType.isBoolean()) {
o = Boolean.parseBoolean(session.decodeLiteral(r.getElementText()));
- } else if (ft.isCharSequence()) {
+ } else if (sType.isCharSequence()) {
o = session.decodeString(r.getElementText());
- } else if (ft.isChar()) {
+ } else if (sType.isChar()) {
o = session.decodeString(r.getElementText()).charAt(0);
- } else if (ft.isMap()) {
- Map m = (ft.canCreateNewInstance(outer) ? (Map)ft.newInstance(outer) : new ObjectMap(bc));
- o = parseIntoMap(session, r, m, ft.getKeyType(), ft.getValueType());
+ } else if (sType.isMap()) {
+ Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(bc));
+ o = parseIntoMap(session, r, m, sType.getKeyType(), sType.getValueType());
if (wrapperAttr != null)
o = new ObjectMap(bc).append(wrapperAttr, m);
- } else if (ft.isCollection()) {
- Collection l = (ft.canCreateNewInstance(outer) ? (Collection)ft.newInstance(outer) : new ObjectList(bc));
- o = parseIntoCollection(session, r, l, ft.getElementType());
- } else if (ft.isNumber()) {
- o = parseNumber(session.decodeLiteral(r.getElementText()), (Class<? extends Number>)ft.getInnerClass());
- } else if (ft.canCreateNewInstanceFromObjectMap(outer)) {
+ } else if (sType.isCollection()) {
+ Collection l = (sType.canCreateNewInstance(outer) ? (Collection)sType.newInstance(outer) : new ObjectList(bc));
+ o = parseIntoCollection(session, r, l, sType.getElementType());
+ } else if (sType.isNumber()) {
+ o = parseNumber(session.decodeLiteral(r.getElementText()), (Class<? extends Number>)sType.getInnerClass());
+ } else if (sType.canCreateNewInstanceFromObjectMap(outer)) {
ObjectMap m = new ObjectMap(bc);
parseIntoMap(session, r, m, string(), object());
- o = ft.newInstanceFromObjectMap(outer, m);
- } else if (ft.canCreateNewBean(outer)) {
- if (ft.getExtendedMeta(XmlClassMeta.class).getFormat() == XmlFormat.COLLAPSED) {
+ o = sType.newInstanceFromObjectMap(outer, m);
+ } else if (sType.canCreateNewBean(outer)) {
+ if (sType.getExtendedMeta(XmlClassMeta.class).getFormat() == XmlFormat.COLLAPSED) {
String fieldName = r.getLocalName();
- BeanMap<?> m = bc.newBeanMap(outer, ft.getInnerClass());
+ BeanMap<?> m = bc.newBeanMap(outer, sType.getInnerClass());
BeanPropertyMeta bpm = m.getMeta().getExtendedMeta(XmlBeanMeta.class).getPropertyMeta(fieldName);
ClassMeta<?> cm = m.getMeta().getClassMeta();
Object value = parseAnything(session, cm, currAttr, r, m.getBean(false), false);
@@ -156,25 +156,25 @@ public class XmlParser extends ReaderParser {
bpm.set(m, value);
o = m.getBean();
} else {
- BeanMap m = bc.newBeanMap(outer, ft.getInnerClass());
+ BeanMap m = bc.newBeanMap(outer, sType.getInnerClass());
o = parseIntoBean(session, r, m).getBean();
}
- } else if (ft.isArray()) {
- ArrayList l = (ArrayList)parseIntoCollection(session, r, new ArrayList(), ft.getElementType());
- o = bc.toArray(ft, l);
- } else if (ft.canCreateNewInstanceFromString(outer)) {
- o = ft.newInstanceFromString(outer, session.decodeString(r.getElementText()));
- } else if (ft.canCreateNewInstanceFromNumber(outer)) {
- o = ft.newInstanceFromNumber(outer, parseNumber(session.decodeLiteral(r.getElementText()), ft.getNewInstanceFromNumberClass()));
+ } else if (sType.isArray()) {
+ ArrayList l = (ArrayList)parseIntoCollection(session, r, new ArrayList(), sType.getElementType());
+ o = bc.toArray(sType, l);
+ } else if (sType.canCreateNewInstanceFromString(outer)) {
+ o = sType.newInstanceFromString(outer, session.decodeString(r.getElementText()));
+ } else if (sType.canCreateNewInstanceFromNumber(outer)) {
+ o = sType.newInstanceFromNumber(outer, parseNumber(session.decodeLiteral(r.getElementText()), sType.getNewInstanceFromNumberClass()));
} else {
- throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", ft.getInnerClass().getName(), ft.getNotABeanReason());
+ throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason());
}
if (transform != null && o != null)
- o = transform.unswap(o, nt, bc);
+ o = transform.unswap(o, eType, bc);
if (outer != null)
- setParent(nt, o, outer);
+ setParent(eType, o, outer);
return (T)o;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
index 8e64065..b3c311b 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
@@ -197,9 +197,9 @@ public class XmlSchemaSerializer extends XmlSerializer {
queueElement(ns, "null", object());
else {
XmlClassMeta xmlMeta = cm.getExtendedMeta(XmlClassMeta.class);
- if (cm.getLexiconName() != null && xmlMeta.getNamespace() != null)
+ if (cm.getDictionaryName() != null && xmlMeta.getNamespace() != null)
ns = xmlMeta.getNamespace();
- queueElement(ns, cm.getLexiconName(), cm);
+ queueElement(ns, cm.getDictionaryName(), cm);
}
processQueue();
}
@@ -521,7 +521,7 @@ public class XmlSchemaSerializer extends XmlSerializer {
private String getElementName(ClassMeta<?> cm) {
cm = cm.getSerializedClassMeta();
- String name = cm.getLexiconName();
+ String name = cm.getDictionaryName();
if (name == null) {
if (cm.isBoolean())
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index 7ceac46..a381b41 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -304,7 +304,7 @@ public class XmlSerializer extends WriterSerializer {
int indent = session.indent; // Current indentation
ClassMeta<?> aType = null; // The actual type
ClassMeta<?> wType = null; // The wrapped type
- ClassMeta<?> gType = object(); // The generic type
+ ClassMeta<?> sType = object(); // The serialized type
aType = session.push(elementName, o, eType);
@@ -324,7 +324,7 @@ public class XmlSerializer extends WriterSerializer {
aType = ((Delegate)o).getClassMeta();
}
- gType = aType.getSerializedClassMeta();
+ sType = aType.getSerializedClassMeta();
// Swap if necessary
PojoSwap swap = aType.getPojoSwap();
@@ -333,11 +333,11 @@ public class XmlSerializer extends WriterSerializer {
// If the getSwapClass() method returns Object, we need to figure out
// the actual type now.
- if (gType.isObject())
- gType = bc.getClassMetaForObject(o);
+ if (sType.isObject())
+ sType = bc.getClassMetaForObject(o);
}
} else {
- gType = eType.getSerializedClassMeta();
+ sType = eType.getSerializedClassMeta();
}
String classAttr = null;
@@ -349,23 +349,23 @@ public class XmlSerializer extends WriterSerializer {
}
// char '\0' is interpreted as null.
- if (o != null && gType.isChar() && ((Character)o).charValue() == 0)
+ if (o != null && sType.isChar() && ((Character)o).charValue() == 0)
o = null;
boolean isCollapsed = false; // If 'true', this is a collection and we're not rendering the outer element.
// Get the JSON type string.
- if (gType.isCharSequence() || gType.isChar())
+ if (sType.isCharSequence() || sType.isChar())
ts = "string";
- else if (gType.isNumber())
+ else if (sType.isNumber())
ts = "number";
- else if (gType.isBoolean())
+ else if (sType.isBoolean())
ts = "boolean";
- else if (gType.isMap() || gType.isBean() || gType.hasToObjectMapMethod()) {
- isCollapsed = gType.getExtendedMeta(XmlClassMeta.class).getFormat() == XmlFormat.COLLAPSED;
+ else if (sType.isMap() || sType.isBean() || sType.hasToObjectMapMethod()) {
+ isCollapsed = sType.getExtendedMeta(XmlClassMeta.class).getFormat() == XmlFormat.COLLAPSED;
ts = "object";
}
- else if (gType.isCollection() || gType.isArray()) {
+ else if (sType.isCollection() || sType.isArray()) {
isCollapsed = (format == COLLAPSED && ! addNamespaceUris);
ts = "array";
}
@@ -375,9 +375,9 @@ public class XmlSerializer extends WriterSerializer {
// Is there a name associated with this bean?
if (elementName == null)
- elementName = gType.getLexiconName();
+ elementName = sType.getDictionaryName();
if (elementName == null)
- elementName = aType.getLexiconName();
+ elementName = aType.getDictionaryName();
// If the value is null then it's either going to be <null/> or <XmlSerializer nil='true'/>
// depending on whether the element has a name.
@@ -388,7 +388,7 @@ public class XmlSerializer extends WriterSerializer {
if (session.isEnableNamespaces()) {
if (elementNamespace == null)
- elementNamespace = gType.getExtendedMeta(XmlClassMeta.class).getNamespace();
+ elementNamespace = sType.getExtendedMeta(XmlClassMeta.class).getNamespace();
if (elementNamespace == null)
elementNamespace = aType.getExtendedMeta(XmlClassMeta.class).getNamespace();
if (elementNamespace != null && elementNamespace.uri == null)
@@ -400,7 +400,7 @@ public class XmlSerializer extends WriterSerializer {
}
// Do we need a carriage return after the start tag?
- boolean cr = o != null && (gType.isMap() || gType.isCollection() || gType.isArray() || gType.isBean() || gType.hasToObjectMapMethod());
+ boolean cr = o != null && (sType.isMap() || sType.isCollection() || sType.isArray() || sType.isBean() || sType.hasToObjectMapMethod());
String en = (elementName == null ? ts : elementName);
boolean encodeEn = elementName != null;
@@ -434,14 +434,14 @@ public class XmlSerializer extends WriterSerializer {
if (o == null) {
if (! isNullTag)
out.attr(xsi, "nil", "true");
- if ((gType.isBoolean() || gType.isNumber()) && ! gType.isNullable())
- o = gType.getPrimitiveDefault();
+ if ((sType.isBoolean() || sType.isNumber()) && ! sType.isNullable())
+ o = sType.getPrimitiveDefault();
}
- if (o != null && !(gType.isMap() || gType.isBean() || gType.hasToObjectMapMethod()))
+ if (o != null && !(sType.isMap() || sType.isBean() || sType.hasToObjectMapMethod()))
out.append('>');
- if (cr && !(gType.isMap() || gType.isBean() || gType.hasToObjectMapMethod()))
+ if (cr && !(sType.isMap() || sType.isBean() || sType.hasToObjectMapMethod()))
out.nl();
}
@@ -449,33 +449,33 @@ public class XmlSerializer extends WriterSerializer {
// Render the tag contents.
if (o != null) {
- if (gType.isUri() || (pMeta != null && pMeta.isUri()))
+ if (sType.isUri() || (pMeta != null && pMeta.isUri()))
out.appendUri(o);
- else if (gType.isCharSequence() || gType.isChar())
+ else if (sType.isCharSequence() || sType.isChar())
out.encodeText(session.trim(o));
- else if (gType.isNumber() || gType.isBoolean())
+ else if (sType.isNumber() || sType.isBoolean())
out.append(o);
- else if (gType.isMap() || (wType != null && wType.isMap())) {
+ else if (sType.isMap() || (wType != null && wType.isMap())) {
if (o instanceof BeanMap)
hasChildren = serializeBeanMap(session, out, (BeanMap)o, elementNamespace, isCollapsed);
else
- hasChildren = serializeMap(session, out, (Map)o, gType);
+ hasChildren = serializeMap(session, out, (Map)o, sType);
}
- else if (gType.hasToObjectMapMethod())
- hasChildren = serializeMap(session, out, gType.toObjectMap(o), gType);
- else if (gType.isBean())
+ else if (sType.hasToObjectMapMethod())
+ hasChildren = serializeMap(session, out, sType.toObjectMap(o), sType);
+ else if (sType.isBean())
hasChildren = serializeBeanMap(session, out, bc.forBean(o), elementNamespace, isCollapsed);
- else if (gType.isCollection() || (wType != null && wType.isCollection())) {
+ else if (sType.isCollection() || (wType != null && wType.isCollection())) {
if (isCollapsed)
session.indent--;
- serializeCollection(session, out, (Collection)o, gType, pMeta);
+ serializeCollection(session, out, (Collection)o, sType, pMeta);
if (isCollapsed)
session.indent++;
}
- else if (gType.isArray()) {
+ else if (sType.isArray()) {
if (isCollapsed)
session.indent--;
- serializeCollection(session, out, toList(gType.getInnerClass(), o), gType, pMeta);
+ serializeCollection(session, out, toList(sType.getInnerClass(), o), sType, pMeta);
if (isCollapsed)
session.indent++;
}
@@ -621,7 +621,7 @@ public class XmlSerializer extends WriterSerializer {
}
if (eName == null && ! elementType.isObject()) {
- eName = elementType.getLexiconName();
+ eName = elementType.getDictionaryName();
eNs = elementType.getExtendedMeta(XmlClassMeta.class).getNamespace();
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/test/java/org/apache/juneau/BeanFilterTest.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/java/org/apache/juneau/BeanFilterTest.java b/juneau-core/src/test/java/org/apache/juneau/BeanFilterTest.java
index ffef4a0..fb27219 100755
--- a/juneau-core/src/test/java/org/apache/juneau/BeanFilterTest.java
+++ b/juneau-core/src/test/java/org/apache/juneau/BeanFilterTest.java
@@ -62,12 +62,12 @@ public class BeanFilterTest {
public B fb;
}
- @Bean(name="A1")
+ @Bean(typeName="A1")
public static class A1 extends A {
public String f1;
}
- @Bean(name="A2")
+ @Bean(typeName="A2")
public static class A2 extends A {
public String f2;
}
@@ -80,12 +80,12 @@ public class BeanFilterTest {
public String f0b = "f0b";
}
- @Bean(name="B1")
+ @Bean(typeName="B1")
public static class B1 extends B {
public String f1;
}
- @Bean(name="B2")
+ @Bean(typeName="B2")
public static class B2 extends B {
public String f2;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java b/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
index cbd6a76..f14fe72 100755
--- a/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
+++ b/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMapsTest.java
@@ -255,7 +255,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
public String f0 = "f0";
}
- @Bean(name="B1")
+ @Bean(typeName="B1")
public static class B1 extends B {
public String f1;
public static B1 create() {
@@ -266,7 +266,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
}
}
- @Bean(name="B2")
+ @Bean(typeName="B2")
public static class B2 extends B {
public int f2;
public static B2 create() {
@@ -277,7 +277,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
}
}
- @Bean(name="B3")
+ @Bean(typeName="B3")
public static class B3 extends B {
public XMLGregorianCalendar f3;
public static B3 create() throws Exception {
@@ -397,7 +397,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
public String f0a, subType, f0b;
}
- @Bean(name="BA1")
+ @Bean(typeName="BA1")
public static class BA1 extends BA {
public String f1;
public static BA1 create() {
@@ -410,7 +410,7 @@ public class RoundTripBeanMapsTest extends RoundTripTest {
}
}
- @Bean(name="BA2")
+ @Bean(typeName="BA2")
public static class BA2 extends BA {
public String f2;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java b/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
index b9353eb..390fab7 100755
--- a/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
+++ b/juneau-core/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
@@ -302,7 +302,7 @@ public class RoundTripTransformBeansTest extends RoundTripTest {
}
}
- @Bean(name="C3")
+ @Bean(typeName="C3")
public static class C3<T> extends C2<T> {
public static C3 create() {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java b/juneau-core/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
index e7b32c9..57fa275 100755
--- a/juneau-core/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
+++ b/juneau-core/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
@@ -335,7 +335,7 @@ public class XmlCollapsedTest {
}
}
- @Bean(name="xf1")
+ @Bean(typeName="xf1")
public static class F1 {
@Xml(format=CONTENT)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/test/java/org/apache/juneau/xml/XmlContentTest.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/test/java/org/apache/juneau/xml/XmlContentTest.java b/juneau-core/src/test/java/org/apache/juneau/xml/XmlContentTest.java
index 9f5e9c7..3773dc2 100755
--- a/juneau-core/src/test/java/org/apache/juneau/xml/XmlContentTest.java
+++ b/juneau-core/src/test/java/org/apache/juneau/xml/XmlContentTest.java
@@ -126,7 +126,7 @@ public class XmlContentTest {
assertEqualObjects(t, t2);
}
- @Bean(name="A")
+ @Bean(typeName="A")
public static class A {
@Xml(format=ATTR) public String f1;
@Xml(format=CONTENT) public String f2;
@@ -249,7 +249,7 @@ public class XmlContentTest {
assertEqualObjects(t, t2);
}
- @Bean(name="A")
+ @Bean(typeName="A")
public static class B {
@Xml(format=ATTR) public String f1;
@Xml(format=CONTENT, contentHandler=BContentHandler.class) public String f2;
[4/4] incubator-juneau git commit: Rename classLexicon to
typeDictionary, and other minor field name changes.
Posted by ja...@apache.org.
Rename classLexicon to typeDictionary, and other minor field name
changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/e1c60b10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/e1c60b10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/e1c60b10
Branch: refs/heads/master
Commit: e1c60b10142b4c45658a2c25ab6137246de990bf
Parents: 47b9ce6
Author: jamesbognar <ja...@gmail.com>
Authored: Wed Sep 7 16:27:11 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Wed Sep 7 16:27:11 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/juneau/BeanContext.java | 26 ++--
.../main/java/org/apache/juneau/BeanMeta.java | 8 +-
.../org/apache/juneau/BeanPropertyMeta.java | 32 ++---
.../java/org/apache/juneau/ClassLexicon.java | 141 -------------------
.../main/java/org/apache/juneau/ClassMeta.java | 36 ++---
.../main/java/org/apache/juneau/ObjectMap.java | 18 +--
.../java/org/apache/juneau/TypeDictionary.java | 137 ++++++++++++++++++
.../java/org/apache/juneau/annotation/Bean.java | 33 +++--
.../apache/juneau/annotation/BeanProperty.java | 13 +-
.../java/org/apache/juneau/annotation/Pojo.java | 74 +---------
.../org/apache/juneau/dto/atom/Category.java | 2 +-
.../java/org/apache/juneau/dto/atom/Entry.java | 2 +-
.../java/org/apache/juneau/dto/atom/Feed.java | 2 +-
.../org/apache/juneau/dto/atom/Generator.java | 2 +-
.../java/org/apache/juneau/dto/atom/Icon.java | 2 +-
.../java/org/apache/juneau/dto/atom/Id.java | 2 +-
.../java/org/apache/juneau/dto/atom/Link.java | 2 +-
.../java/org/apache/juneau/dto/atom/Logo.java | 2 +-
.../org/apache/juneau/dto/cognos/Column.java | 2 +-
.../org/apache/juneau/dto/cognos/DataSet.java | 4 +-
.../apache/juneau/dto/jsonschema/Schema.java | 2 +-
.../java/org/apache/juneau/html/HtmlParser.java | 98 ++++++-------
.../juneau/html/HtmlSchemaDocSerializer.java | 30 ++--
.../org/apache/juneau/html/HtmlSerializer.java | 38 ++---
.../main/java/org/apache/juneau/html/dto/A.java | 2 +-
.../java/org/apache/juneau/html/dto/Abbr.java | 2 +-
.../org/apache/juneau/html/dto/Address.java | 2 +-
.../java/org/apache/juneau/html/dto/Area.java | 2 +-
.../org/apache/juneau/html/dto/Article.java | 2 +-
.../java/org/apache/juneau/html/dto/Aside.java | 2 +-
.../java/org/apache/juneau/html/dto/Audio.java | 2 +-
.../main/java/org/apache/juneau/html/dto/B.java | 2 +-
.../java/org/apache/juneau/html/dto/Base.java | 2 +-
.../java/org/apache/juneau/html/dto/Bdi.java | 2 +-
.../java/org/apache/juneau/html/dto/Bdo.java | 2 +-
.../org/apache/juneau/html/dto/Blockquote.java | 2 +-
.../java/org/apache/juneau/html/dto/Body.java | 2 +-
.../java/org/apache/juneau/html/dto/Br.java | 2 +-
.../java/org/apache/juneau/html/dto/Button.java | 2 +-
.../java/org/apache/juneau/html/dto/Canvas.java | 2 +-
.../org/apache/juneau/html/dto/Caption.java | 2 +-
.../java/org/apache/juneau/html/dto/Cite.java | 2 +-
.../java/org/apache/juneau/html/dto/Code.java | 2 +-
.../java/org/apache/juneau/html/dto/Col.java | 2 +-
.../org/apache/juneau/html/dto/Colgroup.java | 2 +-
.../org/apache/juneau/html/dto/Command.java | 2 +-
.../java/org/apache/juneau/html/dto/Data.java | 2 +-
.../org/apache/juneau/html/dto/Datalist.java | 2 +-
.../java/org/apache/juneau/html/dto/Dd.java | 2 +-
.../java/org/apache/juneau/html/dto/Del.java | 2 +-
.../org/apache/juneau/html/dto/Details.java | 2 +-
.../java/org/apache/juneau/html/dto/Dfn.java | 2 +-
.../java/org/apache/juneau/html/dto/Div.java | 2 +-
.../java/org/apache/juneau/html/dto/Dl.java | 2 +-
.../java/org/apache/juneau/html/dto/Dt.java | 2 +-
.../java/org/apache/juneau/html/dto/Em.java | 2 +-
.../java/org/apache/juneau/html/dto/Embed.java | 2 +-
.../org/apache/juneau/html/dto/Fieldset.java | 2 +-
.../org/apache/juneau/html/dto/Figcaption.java | 2 +-
.../java/org/apache/juneau/html/dto/Figure.java | 2 +-
.../java/org/apache/juneau/html/dto/Footer.java | 2 +-
.../java/org/apache/juneau/html/dto/Form.java | 2 +-
.../java/org/apache/juneau/html/dto/H1.java | 2 +-
.../java/org/apache/juneau/html/dto/H2.java | 2 +-
.../java/org/apache/juneau/html/dto/H3.java | 2 +-
.../java/org/apache/juneau/html/dto/H4.java | 2 +-
.../java/org/apache/juneau/html/dto/H5.java | 2 +-
.../java/org/apache/juneau/html/dto/H6.java | 2 +-
.../java/org/apache/juneau/html/dto/Head.java | 2 +-
.../java/org/apache/juneau/html/dto/Header.java | 2 +-
.../java/org/apache/juneau/html/dto/Hgroup.java | 2 +-
.../java/org/apache/juneau/html/dto/Hr.java | 2 +-
.../java/org/apache/juneau/html/dto/Html.java | 2 +-
.../main/java/org/apache/juneau/html/dto/I.java | 2 +-
.../java/org/apache/juneau/html/dto/IFrame.java | 2 +-
.../java/org/apache/juneau/html/dto/Img.java | 2 +-
.../java/org/apache/juneau/html/dto/Input.java | 2 +-
.../java/org/apache/juneau/html/dto/Ins.java | 2 +-
.../java/org/apache/juneau/html/dto/Kbd.java | 2 +-
.../java/org/apache/juneau/html/dto/Keygen.java | 2 +-
.../java/org/apache/juneau/html/dto/Label.java | 2 +-
.../java/org/apache/juneau/html/dto/Legend.java | 2 +-
.../java/org/apache/juneau/html/dto/Li.java | 2 +-
.../java/org/apache/juneau/html/dto/Link.java | 2 +-
.../java/org/apache/juneau/html/dto/Main.java | 2 +-
.../java/org/apache/juneau/html/dto/Map.java | 2 +-
.../java/org/apache/juneau/html/dto/Mark.java | 2 +-
.../java/org/apache/juneau/html/dto/Menu.java | 2 +-
.../java/org/apache/juneau/html/dto/Meta.java | 2 +-
.../java/org/apache/juneau/html/dto/Meter.java | 2 +-
.../java/org/apache/juneau/html/dto/Nav.java | 2 +-
.../org/apache/juneau/html/dto/Noscript.java | 2 +-
.../java/org/apache/juneau/html/dto/Object.java | 2 +-
.../java/org/apache/juneau/html/dto/Ol.java | 2 +-
.../org/apache/juneau/html/dto/Optgroup.java | 2 +-
.../java/org/apache/juneau/html/dto/Option.java | 2 +-
.../java/org/apache/juneau/html/dto/Output.java | 2 +-
.../main/java/org/apache/juneau/html/dto/P.java | 2 +-
.../java/org/apache/juneau/html/dto/Param.java | 2 +-
.../java/org/apache/juneau/html/dto/Pre.java | 2 +-
.../org/apache/juneau/html/dto/Progress.java | 2 +-
.../main/java/org/apache/juneau/html/dto/Q.java | 2 +-
.../java/org/apache/juneau/html/dto/Rb.java | 2 +-
.../java/org/apache/juneau/html/dto/Rp.java | 2 +-
.../java/org/apache/juneau/html/dto/Rt.java | 2 +-
.../java/org/apache/juneau/html/dto/Rtc.java | 2 +-
.../java/org/apache/juneau/html/dto/Ruby.java | 2 +-
.../main/java/org/apache/juneau/html/dto/S.java | 2 +-
.../java/org/apache/juneau/html/dto/Samp.java | 2 +-
.../java/org/apache/juneau/html/dto/Script.java | 2 +-
.../org/apache/juneau/html/dto/Section.java | 2 +-
.../java/org/apache/juneau/html/dto/Select.java | 2 +-
.../java/org/apache/juneau/html/dto/Small.java | 2 +-
.../java/org/apache/juneau/html/dto/Source.java | 2 +-
.../java/org/apache/juneau/html/dto/Span.java | 2 +-
.../java/org/apache/juneau/html/dto/Strong.java | 2 +-
.../java/org/apache/juneau/html/dto/Style.java | 2 +-
.../java/org/apache/juneau/html/dto/Sub.java | 2 +-
.../org/apache/juneau/html/dto/Summary.java | 2 +-
.../java/org/apache/juneau/html/dto/Sup.java | 2 +-
.../java/org/apache/juneau/html/dto/Table.java | 2 +-
.../java/org/apache/juneau/html/dto/Tbody.java | 2 +-
.../java/org/apache/juneau/html/dto/Td.java | 2 +-
.../org/apache/juneau/html/dto/Template.java | 2 +-
.../org/apache/juneau/html/dto/Textarea.java | 2 +-
.../java/org/apache/juneau/html/dto/Tfoot.java | 2 +-
.../java/org/apache/juneau/html/dto/Th.java | 2 +-
.../java/org/apache/juneau/html/dto/Thead.java | 2 +-
.../java/org/apache/juneau/html/dto/Time.java | 2 +-
.../java/org/apache/juneau/html/dto/Title.java | 2 +-
.../java/org/apache/juneau/html/dto/Tr.java | 2 +-
.../java/org/apache/juneau/html/dto/Track.java | 2 +-
.../main/java/org/apache/juneau/html/dto/U.java | 2 +-
.../java/org/apache/juneau/html/dto/Ul.java | 2 +-
.../java/org/apache/juneau/html/dto/Var.java | 2 +-
.../java/org/apache/juneau/html/dto/Video.java | 2 +-
.../java/org/apache/juneau/html/dto/Wbr.java | 2 +-
.../java/org/apache/juneau/jena/RdfParser.java | 84 +++++------
.../org/apache/juneau/jena/RdfSerializer.java | 50 +++----
.../java/org/apache/juneau/json/JsonParser.java | 76 +++++-----
.../juneau/json/JsonSchemaSerializer.java | 30 ++--
.../org/apache/juneau/json/JsonSerializer.java | 34 ++---
.../apache/juneau/msgpack/MsgPackParser.java | 76 +++++-----
.../juneau/msgpack/MsgPackSerializer.java | 36 ++---
.../java/org/apache/juneau/parser/Parser.java | 16 +--
.../juneau/serializer/SerializerSession.java | 16 +--
.../juneau/transform/AnnotationBeanFilter.java | 17 +--
.../org/apache/juneau/transform/BeanFilter.java | 20 +--
.../apache/juneau/urlencoding/UonParser.java | 86 +++++------
.../juneau/urlencoding/UonSerializer.java | 32 ++---
.../juneau/urlencoding/UrlEncodingParser.java | 44 +++---
.../urlencoding/UrlEncodingSerializer.java | 24 ++--
.../apache/juneau/xml/XmlBeanPropertyMeta.java | 4 +-
.../java/org/apache/juneau/xml/XmlParser.java | 74 +++++-----
.../apache/juneau/xml/XmlSchemaSerializer.java | 6 +-
.../org/apache/juneau/xml/XmlSerializer.java | 66 ++++-----
.../java/org/apache/juneau/BeanFilterTest.java | 8 +-
.../juneau/a/rttests/RoundTripBeanMapsTest.java | 10 +-
.../a/rttests/RoundTripTransformBeansTest.java | 2 +-
.../org/apache/juneau/xml/XmlCollapsedTest.java | 2 +-
.../org/apache/juneau/xml/XmlContentTest.java | 4 +-
.../java/org/apache/juneau/xml/XmlTest.java | 92 ++++++------
.../java/org/apache/juneau/xml/xml1a/T2.java | 2 +-
.../java/org/apache/juneau/xml/xml1b/T4.java | 2 +-
.../java/org/apache/juneau/xml/xml1b/T5.java | 2 +-
.../juneau/samples/addressbook/Address.java | 2 +-
.../juneau/samples/addressbook/AddressBook.java | 2 +-
.../samples/addressbook/CreateAddress.java | 2 +-
.../samples/addressbook/CreatePerson.java | 2 +-
.../juneau/samples/addressbook/Person.java | 2 +-
170 files changed, 886 insertions(+), 973 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/BeanContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java
index d8add3a..7067840 100644
--- a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -447,19 +447,19 @@ public class BeanContext extends Context {
public static final String BEAN_implClasses_put = "BeanContext.implClasses.map.put";
/**
- * Specifies the list of classes that make up the class lexicon for this bean context (<code>List<Class></code>).
+ * Specifies the list of classes that make up the class dictionary for this bean context (<code>List<Class></code>).
*/
- public static final String BEAN_classLexicon = "BeanContext.classLexicon.list";
+ public static final String BEAN_typeDictionary = "BeanContext.typeDictionary.list";
/**
- * Add to the class lexicon list.
+ * Add to the class dictionary list.
*/
- public static final String BEAN_classLexicon_add = "BeanContext.classLexicon.list.add";
+ public static final String BEAN_typeDictionary_add = "BeanContext.typeDictionary.list.add";
/**
- * Remove from the class lexicon list.
+ * Remove from the class dictionary list.
*/
- public static final String BEAN_classLexicon_remove = "BeanContext.classLexicon.list.remove";
+ public static final String BEAN_typeDictionary_remove = "BeanContext.typeDictionary.list.remove";
/**
* Specifies the default parser to use when converting <code>Strings</code> to POJOs in the {@link BeanContext#convertToType(Object, Class)} method (<code>Class</code>).
@@ -540,7 +540,7 @@ public class BeanContext extends Context {
final String[] notBeanPackageNames, notBeanPackagePrefixes;
final BeanFilter<?>[] beanFilters;
final PojoSwap<?,?>[] pojoSwaps;
- final ClassLexicon classLexicon;
+ final TypeDictionary typeDictionary;
final Map<Class<?>,Class<?>> implClasses;
final Class<?>[] implKeyClasses, implValueClasses;
final ClassLoader classLoader;
@@ -631,7 +631,7 @@ public class BeanContext extends Context {
}
pojoSwaps = lpf.toArray(new PojoSwap[0]);
- classLexicon = new ClassLexicon(pm.get(BEAN_classLexicon, Class[].class, new Class[0]));
+ typeDictionary = new TypeDictionary(pm.get(BEAN_typeDictionary, Class[].class, new Class[0]));
implClasses = new TreeMap<Class<?>,Class<?>>(new ClassComparator());
Map<Class,Class> m = pm.getMap(BEAN_implClasses, Class.class, Class.class, null);
@@ -1475,12 +1475,12 @@ public class BeanContext extends Context {
}
/**
- * Returns the class lexicon defined in this bean context defined by {@link BeanContext#BEAN_classLexicon}.
+ * Returns the type dictionary defined in this bean context defined by {@link BeanContext#BEAN_typeDictionary}.
*
- * @return The class lexicon defined in this bean context. Never <jk>null</jk>.
+ * @return The type dictionary defined in this bean context. Never <jk>null</jk>.
*/
- protected ClassLexicon getClassLexicon() {
- return classLexicon;
+ protected TypeDictionary getTypeDictionary() {
+ return typeDictionary;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java
index fc65f54..41a8e88 100644
--- a/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/BeanMeta.java
@@ -141,7 +141,7 @@ public class BeanMeta<T> {
MetadataMap extMeta = new MetadataMap();
BeanPropertyMeta subTypeIdProperty;
PropertyNamer propertyNamer;
- ClassLexicon classLexicon;
+ TypeDictionary typeDictionary;
private Builder(ClassMeta<T> classMeta, BeanContext ctx, BeanFilter<? extends T> beanFilter, String[] pNames) {
this.classMeta = classMeta;
@@ -225,7 +225,7 @@ public class BeanMeta<T> {
if (beanFilter.getPropertyNamer() != null)
propertyNamer = beanFilter.getPropertyNamer();
- classLexicon = beanFilter.getClassLexicon();
+ typeDictionary = beanFilter.getTypeDictionary();
}
if (propertyNamer == null)
@@ -337,8 +337,8 @@ public class BeanMeta<T> {
properties.put(subTypeProperty, this.subTypeIdProperty);
}
- if (classLexicon == null)
- classLexicon = ctx.getClassLexicon();
+ if (typeDictionary == null)
+ typeDictionary = ctx.getTypeDictionary();
properties.putAll(normalProps);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java b/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index 6860b51..c5adea6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -58,7 +58,7 @@ public class BeanPropertyMeta {
private PojoSwap swap; // PojoSwap defined only via @BeanProperty annotation.
private MetadataMap extMeta = new MetadataMap(); // Extended metadata
- private ClassLexicon classLexicon;
+ private TypeDictionary typeDictionary;
/**
* Constructor.
@@ -144,18 +144,18 @@ public class BeanPropertyMeta {
}
/**
- * Returns the class lexicon in use for this bean property.
- * The order of lookup for the lexicon is as follows:
+ * Returns the class dictionary in use for this bean property.
+ * The order of lookup for the dictionary is as follows:
* <ol>
- * <li>Lexicon defined via {@link BeanProperty#classLexicon()}.
- * <li>Lexicon defined via {@link Bean#classLexicon()} or {@link Pojo#classLexicon()} (or {@link BeanFilter} equivalent).
- * <li>Lexicon defined via {@link BeanContext#BEAN_classLexicon} context property.
+ * <li>Dictionary defined via {@link BeanProperty#typeDictionary()}.
+ * <li>Dictionary defined via {@link Bean#typeDictionary()} (or {@link BeanFilter} equivalent).
+ * <li>Dictionary defined via {@link BeanContext#BEAN_typeDictionary} context property.
* </ol>
*
- * @return The class lexicon in use for this bean property. Never <jk>null</jk>.
+ * @return The class dictionary in use for this bean property. Never <jk>null</jk>.
*/
- public ClassLexicon getClassLexicon() {
- return classLexicon;
+ public TypeDictionary getTypeDictionary() {
+ return typeDictionary;
}
/**
@@ -256,8 +256,8 @@ public class BeanPropertyMeta {
swap = getPropertyPojoSwap(p);
if (p.properties().length != 0)
properties = p.properties();
- if (p.classLexicon().length > 0)
- this.classLexicon = new ClassLexicon(p.classLexicon());
+ if (p.typeDictionary().length > 0)
+ this.typeDictionary = new TypeDictionary(p.typeDictionary());
}
}
@@ -271,8 +271,8 @@ public class BeanPropertyMeta {
swap = getPropertyPojoSwap(p);
if (properties != null && p.properties().length != 0)
properties = p.properties();
- if (p.classLexicon().length > 0)
- this.classLexicon = new ClassLexicon(p.classLexicon());
+ if (p.typeDictionary().length > 0)
+ this.typeDictionary = new TypeDictionary(p.typeDictionary());
}
}
@@ -286,8 +286,8 @@ public class BeanPropertyMeta {
swap = getPropertyPojoSwap(p);
if (properties != null && p.properties().length != 0)
properties = p.properties();
- if (p.classLexicon().length > 0)
- this.classLexicon = new ClassLexicon(p.classLexicon());
+ if (p.typeDictionary().length > 0)
+ this.typeDictionary = new TypeDictionary(p.typeDictionary());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/ClassLexicon.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ClassLexicon.java b/juneau-core/src/main/java/org/apache/juneau/ClassLexicon.java
deleted file mode 100644
index 8725c3e..0000000
--- a/juneau-core/src/main/java/org/apache/juneau/ClassLexicon.java
+++ /dev/null
@@ -1,141 +0,0 @@
-// ***************************************************************************************************************************
-// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
-// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
-// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
-// * *
-// * http://www.apache.org/licenses/LICENSE-2.0 *
-// * *
-// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
-// * specific language governing permissions and limitations under the License. *
-// ***************************************************************************************************************************
-package org.apache.juneau;
-
-import java.util.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * A lookup table for resolving classes by name.
- * <p>
- * In a nutshell, provides a simple mapping of class objects to identifying names by implementing the following two methods:
- * <ul>
- * <li>{@link #getClassForName(String)}
- * <li>{@link #getNameForClass(Class)}
- * </ul>
- * <p>
- * Class names are defined through the {@link Bean#name()} or {@link Pojo#name()} annotations when using the {@link ClassLexicon#ClassLexicon(Class...)}
- * constructor, but can be defined programmatically by using the {@link ClassLexicon#ClassLexicon(Map)} constructor.
- * <p>
- * The lexicon is used by the framework in the following ways:
- * <ul>
- * <li>If a class type cannot be inferred through reflection during parsing, then a helper <js>"_class"</js> is added to the serialized output
- * using the name defined for that class in this lexicon. This helps determine the real class at parse time.
- * <li>The lexicon name is used as element names when serialized to XML.
- * </ul>
- *
- * @author james.bognar
- */
-public class ClassLexicon {
-
- private final Map<String,Class<?>> map;
- private final Map<Class<?>,String> reverseMap;
-
- /**
- * Constructor.
- *
- * @param classes
- * List of classes to add to this lexicon table.
- * Each class must be one of the following:
- * <ul>
- * <li>A bean class that specifies a value for {@link Bean#name() @Bean.name()}.
- * <li>A POJO class that specifies a value for {@link Pojo#name() @Pojo.name()}.
- * <li>A subclass of {@link ClassLexicon} whose contents will be added to this list.
- * Note that this subclass must implement a no-arg constructor.
- * </ul>
- */
- public ClassLexicon(Class<?>...classes) {
- this(null, classes);
- }
-
- /**
- * Constructor with optional copy-from lexicon.
- *
- * @param copyFrom The lexicon to initialize the contents of this lexicon with.
- * @param classes List of classes to add to this lexicon.
- */
- public ClassLexicon(ClassLexicon copyFrom, Class<?>...classes) {
- Map<String,Class<?>> m = new HashMap<String,Class<?>>();
- if (copyFrom != null)
- m.putAll(copyFrom.map);
- for (Class<?> c : classes) {
- if (c != null) {
- if (ClassUtils.isParentClass(ClassLexicon.class, c)) {
- try {
- ClassLexicon l2 = (ClassLexicon)c.newInstance();
- m.putAll(l2.map);
- } catch (Exception e) {
- throw new BeanRuntimeException(e);
- }
- } else {
- Pojo p = c.getAnnotation(Pojo.class);
- Bean b = c.getAnnotation(Bean.class);
- String name = null;
- if (p != null && ! p.name().isEmpty()) {
- name = p.name();
- } else if (b != null && ! b.name().isEmpty()) {
- name = b.name();
- } else {
- name = c.getName();
- }
- m.put(name, c);
- }
- }
- }
- this.map = Collections.unmodifiableMap(m);
- Map<Class<?>,String> m2 = new HashMap<Class<?>,String>();
- for (Map.Entry<String,Class<?>> e : map.entrySet())
- m2.put(e.getValue(), e.getKey());
- this.reverseMap = Collections.unmodifiableMap(m2);
- }
-
-
- /**
- * Alternate constructor for defining a lexicon through a user-defined name/class map.
- *
- * @param classMap
- * Contains the name/class pairs to add to this lookup table.
- */
- public ClassLexicon(Map<String,Class<?>> classMap) {
- if (classMap == null)
- throw new BeanRuntimeException("Null passed to ClassLexicon(Map) constructor.");
- Map<String,Class<?>> m = new HashMap<String,Class<?>>(classMap);
- this.map = Collections.unmodifiableMap(m);
- Map<Class<?>,String> m2 = new HashMap<Class<?>,String>();
- for (Map.Entry<String,Class<?>> e : map.entrySet())
- m2.put(e.getValue(), e.getKey());
- this.reverseMap = Collections.unmodifiableMap(m2);
- }
-
- /**
- * Returns the class associated with the specified name.
- *
- * @param name The name associated with the class.
- * @return The class associated with the specified name, or <jk>null</jk> if no association exists.
- */
- public Class<?> getClassForName(String name) {
- return map.get(name);
- }
-
- /**
- * Returns the name associated with the specified class.
- *
- * @param c The class associated with the name.
- * @return The name associated with the specified class, or <jk>null</jk> if no association exists.
- */
- public String getNameForClass(Class<?> c) {
- return reverseMap.get(c);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java
index 2b7ce15..d531d0e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ClassMeta.java
@@ -83,7 +83,7 @@ public final class ClassMeta<T> implements Type {
isMemberClass; // True if this is a non-static member class.
private MetadataMap extMeta = new MetadataMap(); // Extended metadata
- private ClassLexicon classLexicon; // The class lexicon defined on this bean or pojo.
+ private TypeDictionary typeDictionary; // The class dictionary defined on this bean or pojo.
private String name; // The lexical name associated with this bean or pojo.
private Throwable initException; // Any exceptions thrown in the init() method.
@@ -131,18 +131,12 @@ public final class ClassMeta<T> implements Type {
beanFilter = findBeanFilter(beanContext);
pojoSwap = findPojoSwap(beanContext);
- classLexicon = beanContext.getClassLexicon();
- for (Pojo p : ReflectionUtils.findAnnotationsParentFirst(Pojo.class, innerClass)) {
- if (p.classLexicon().length > 0)
- classLexicon = new ClassLexicon(p.classLexicon());
- if (! p.name().isEmpty())
- name = p.name();
- }
+ typeDictionary = beanContext.getTypeDictionary();
for (Bean b : ReflectionUtils.findAnnotationsParentFirst(Bean.class, innerClass)) {
- if (b.classLexicon().length > 0)
- classLexicon = new ClassLexicon(b.classLexicon());
- if (! b.name().isEmpty())
- name = b.name();
+ if (b.typeDictionary().length > 0)
+ typeDictionary = new TypeDictionary(b.typeDictionary());
+ if (! b.typeName().isEmpty())
+ name = b.typeName();
}
serializedClassMeta = (pojoSwap == null ? this : beanContext.getClassMeta(pojoSwap.getSwapClass()));
@@ -392,27 +386,27 @@ public final class ClassMeta<T> implements Type {
}
/**
- * Returns the class lexicon in use for this class.
- * The order of lookup for the lexicon is as follows:
+ * Returns the class dictionary in use for this class.
+ * The order of lookup for the dictionary is as follows:
* <ol>
- * <li>Lexicon defined via {@link Bean#classLexicon()} or {@link Pojo#classLexicon()} (or {@link BeanFilter} equivalent).
- * <li>Lexicon defined via {@link BeanContext#BEAN_classLexicon} context property.
+ * <li>Dictionary defined via {@link Bean#typeDictionary()} (or {@link BeanFilter} equivalent).
+ * <li>Dictionary defined via {@link BeanContext#BEAN_typeDictionary} context property.
* </ol>
*
- * @return The class lexicon in use for this class. Never <jk>null</jk>.
+ * @return The class dictionary in use for this class. Never <jk>null</jk>.
*/
- public ClassLexicon getClassLexicon() {
- return classLexicon;
+ public TypeDictionary getDictionary() {
+ return typeDictionary;
}
/**
* Returns the lexical name associated with this class.
* <p>
- * The lexical name is defined by either {@link Bean#name()} or {@link Pojo#name()}.
+ * The lexical name is defined by {@link Bean#typeName()}.
*
* @return The lexical name associated with this class, or <jk>null</jk> if there is no lexical name defined.
*/
- public String getLexiconName() {
+ public String getDictionaryName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
index a310a7d..5162895 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -1150,26 +1150,26 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* same object if entry does not exist.
*/
public Object cast() {
- return cast((ClassLexicon)null);
+ return cast((TypeDictionary)null);
}
/**
- * Same as {@link #cast()}, but first do a lookup for the name in the specified lexicon.
+ * Same as {@link #cast()}, but first do a lookup for the name in the specified dictionary.
*
- * @param classLexicon
+ * @param typeDictionary
* The class lexicon to resolve the name. Can be <jk>null</jk>.
* @return The new Java object of type specified by the <js>"_class"</js> entry value, or this
* same object if entry does not exist.
*/
- public Object cast(ClassLexicon classLexicon) {
+ public Object cast(TypeDictionary typeDictionary) {
String c = (String)get("_class");
if (c == null) {
if (containsKey("_value"))
return get("_value");
return this;
}
- if (classLexicon != null) {
- Class<?> c2 = classLexicon.getClassForName(c);
+ if (typeDictionary != null) {
+ Class<?> c2 = typeDictionary.getClassForName(c);
if (c2 != null)
return cast2(beanContext.getClassMeta(c2));
}
@@ -1266,7 +1266,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
// Attempt to recursively cast child maps.
if (v instanceof ObjectMap)
- v = ((ObjectMap)v).cast(beanContext.classLexicon);
+ v = ((ObjectMap)v).cast(beanContext.typeDictionary);
k = (kType.isString() ? k : beanContext.convertToType(k, kType));
v = (vType.isObject() ? v : beanContext.convertToType(v, vType));
@@ -1287,7 +1287,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
// Attempt to recursively cast child maps.
if (v instanceof ObjectMap)
- v = ((ObjectMap)v).cast(beanContext.classLexicon);
+ v = ((ObjectMap)v).cast(beanContext.typeDictionary);
bm.put(k, v);
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/TypeDictionary.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/TypeDictionary.java b/juneau-core/src/main/java/org/apache/juneau/TypeDictionary.java
new file mode 100644
index 0000000..0107267
--- /dev/null
+++ b/juneau-core/src/main/java/org/apache/juneau/TypeDictionary.java
@@ -0,0 +1,137 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
+// * with the License. You may obtain a copy of the License at *
+// * *
+// * http://www.apache.org/licenses/LICENSE-2.0 *
+// * *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
+// * specific language governing permissions and limitations under the License. *
+// ***************************************************************************************************************************
+package org.apache.juneau;
+
+import java.util.*;
+
+import org.apache.juneau.annotation.*;
+import org.apache.juneau.internal.*;
+
+/**
+ * A lookup table for resolving classes by name.
+ * <p>
+ * In a nutshell, provides a simple mapping of class objects to identifying names by implementing the following two methods:
+ * <ul>
+ * <li>{@link #getClassForName(String)}
+ * <li>{@link #getNameForClass(Class)}
+ * </ul>
+ * <p>
+ * Class names are defined through the {@link Bean#typeName()} annotations when using the {@link TypeDictionary#TypeDictionary(Class...)}
+ * constructor, but can be defined programmatically by using the {@link TypeDictionary#TypeDictionary(Map)} constructor.
+ * <p>
+ * The dictionary is used by the framework in the following ways:
+ * <ul>
+ * <li>If a class type cannot be inferred through reflection during parsing, then a helper <js>"_class"</js> is added to the serialized output
+ * using the name defined for that class in this dictionary. This helps determine the real class at parse time.
+ * <li>The dictionary name is used as element names when serialized to XML.
+ * </ul>
+ *
+ * @author james.bognar
+ */
+public class TypeDictionary {
+
+ private final Map<String,Class<?>> map;
+ private final Map<Class<?>,String> reverseMap;
+
+ /**
+ * Constructor.
+ *
+ * @param classes
+ * List of classes to add to this dictionary table.
+ * Each class must be one of the following:
+ * <ul>
+ * <li>A bean class that specifies a value for {@link Bean#typeName() @Bean.name()}.
+ * <li>A subclass of {@link TypeDictionary} whose contents will be added to this list.
+ * Note that this subclass must implement a no-arg constructor.
+ * </ul>
+ */
+ public TypeDictionary(Class<?>...classes) {
+ this(null, classes);
+ }
+
+ /**
+ * Constructor with optional copy-from dictionary.
+ *
+ * @param copyFrom The dictionary to initialize the contents of this dictionary with.
+ * @param classes List of classes to add to this dictionary.
+ */
+ public TypeDictionary(TypeDictionary copyFrom, Class<?>...classes) {
+ Map<String,Class<?>> m = new HashMap<String,Class<?>>();
+ if (copyFrom != null)
+ m.putAll(copyFrom.map);
+ for (Class<?> c : classes) {
+ if (c != null) {
+ if (ClassUtils.isParentClass(TypeDictionary.class, c)) {
+ try {
+ TypeDictionary l2 = (TypeDictionary)c.newInstance();
+ m.putAll(l2.map);
+ } catch (Exception e) {
+ throw new BeanRuntimeException(e);
+ }
+ } else {
+ Bean b = c.getAnnotation(Bean.class);
+ String name = null;
+ if (b != null && ! b.typeName().isEmpty()) {
+ name = b.typeName();
+ } else {
+ name = c.getName();
+ }
+ m.put(name, c);
+ }
+ }
+ }
+ this.map = Collections.unmodifiableMap(m);
+ Map<Class<?>,String> m2 = new HashMap<Class<?>,String>();
+ for (Map.Entry<String,Class<?>> e : map.entrySet())
+ m2.put(e.getValue(), e.getKey());
+ this.reverseMap = Collections.unmodifiableMap(m2);
+ }
+
+
+ /**
+ * Alternate constructor for defining a dictionary through a user-defined name/class map.
+ *
+ * @param classMap
+ * Contains the name/class pairs to add to this lookup table.
+ */
+ public TypeDictionary(Map<String,Class<?>> classMap) {
+ if (classMap == null)
+ throw new BeanRuntimeException("Null passed to TypeDictionary(Map) constructor.");
+ Map<String,Class<?>> m = new HashMap<String,Class<?>>(classMap);
+ this.map = Collections.unmodifiableMap(m);
+ Map<Class<?>,String> m2 = new HashMap<Class<?>,String>();
+ for (Map.Entry<String,Class<?>> e : map.entrySet())
+ m2.put(e.getValue(), e.getKey());
+ this.reverseMap = Collections.unmodifiableMap(m2);
+ }
+
+ /**
+ * Returns the class associated with the specified name.
+ *
+ * @param name The name associated with the class.
+ * @return The class associated with the specified name, or <jk>null</jk> if no association exists.
+ */
+ public Class<?> getClassForName(String name) {
+ return map.get(name);
+ }
+
+ /**
+ * Returns the name associated with the specified class.
+ *
+ * @param c The class associated with the name.
+ * @return The name associated with the specified class, or <jk>null</jk> if no association exists.
+ */
+ public String getNameForClass(Class<?> c) {
+ return reverseMap.get(c);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java
index 388c01f..f2859f1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -49,25 +49,25 @@ public @interface Bean {
* output so that the class can be determined during parsing.
* It is also used to specify element names in XML.
* <p>
- * The name is used in combination with the lexicon defined through {@link #classLexicon()}. Together, they make up
+ * The name is used in combination with the class dictionary defined through {@link #typeDictionary()}. Together, they make up
* a simple name/value mapping of names to classes.
- * Names do not need to be universally unique. However, they must be unique within a lexicon.
+ * Names do not need to be universally unique. However, they must be unique within a dictionary.
*
* <dl>
* <dt>Example:</dt>
* <dd>
* <p class='bcode'>
- * <ja>@Bean</ja>(name=<js>"foo"</js>)
+ * <ja>@Bean</ja>(typeName=<js>"foo"</js>)
* <jk>public class</jk> Foo {
* <jc>// A bean property where the object types cannot be inferred since it's an Object[].</jc>
- * <ja>@BeanProperty</ja>(lexicon={Bar.<jk>class</jk>,Baz.<jk>class</jk>})
+ * <ja>@BeanProperty</ja>(typeDictionary={Bar.<jk>class</jk>,Baz.<jk>class</jk>})
* <jk>public</jk> Object[] x = <jk>new</jk> Object[]{<jk>new</jk> Bar(), <jk>new</jk> Baz()};
* }
*
- * <ja>@Bean</ja>(name=<js>"bar"</js>)
+ * <ja>@Bean</ja>(typeName=<js>"bar"</js>)
* <jk>public class</jk> Bar {}
*
- * <ja>@Bean</ja>(name=<js>"baz"</js>)
+ * <ja>@Bean</ja>(typeName=<js>"baz"</js>)
* <jk>public class</jk> Baz {}
* </p>
* <p>
@@ -87,30 +87,29 @@ public @interface Bean {
* <p class='bcode'>
* {
* <jsa>x</jsa>: [
- * {<jsa>n</jsa>:<jss>'bar'</jss>},
- * {<jsa>n</jsa>:<jss>'baz'</jss>}
+ * {<jsa>_type</jsa>:<jss>'bar'</jss>},
+ * {<jsa>_type</jsa>:<jss>'baz'</jss>}
* ]
* } *
* </dd>
* </dl>
*/
- String name() default "";
+ String typeName() default "";
/**
- * The list of classes that make up the class lexicon for this class.
+ * The list of classes that make up the class dictionary for this class.
* <p>
- * The lexicon is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.
- * The names are defined through the {@link #name()} annotation defined on the bean or POJO classes.
+ * The dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.
+ * The names are defined through the {@link #typeName()} annotation defined on the bean or POJO classes.
* <p>
* This list can consist of the following class types:
* <ul>
- * <li>Any bean class that specifies a value for {@link Bean#name() @Bean.name()};
- * <li>Any POJO class that specifies a value for {@link Pojo#name() @Pojo.name()};
- * <li>Any subclass of {@link ClassLexicon} that defines an entire set of mappings.
+ * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.name()};
+ * <li>Any subclass of {@link TypeDictionary} that defines an entire set of mappings.
* Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.
* </ul>
*/
- Class<?>[] classLexicon() default {};
+ Class<?>[] typeDictionary() default {};
/**
* The set and order of names of properties associated with a bean class.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java
index 8e8ef8b..2db87ca 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/BeanProperty.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -169,19 +169,18 @@ public @interface BeanProperty {
String[] properties() default {};
/**
- * The list of classes that make up the class lexicon for this bean proeprty.
+ * The list of classes that make up the class dictionary for this bean proeprty.
* <p>
- * The lexicon is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.
+ * The dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.
* The names are defined through the {@link #name()} annotation defined on the bean or POJO classes.
* <p>
* This list can consist of the following class types:
* <ul>
- * <li>Any bean class that specifies a value for {@link Bean#name() @Bean.name()};
- * <li>Any POJO class that specifies a value for {@link Pojo#name() @Pojo.name()};
- * <li>Any subclass of {@link ClassLexicon} that defines an entire set of mappings.
+ * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.name()};
+ * <li>Any subclass of {@link TypeDictionary} that defines an entire set of mappings.
* Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.
* </ul>
*/
- Class<?>[] classLexicon() default {};
+ Class<?>[] typeDictionary() default {};
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java b/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
index 49eb259..baaac26 100644
--- a/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -17,7 +17,6 @@ import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.*;
-import org.apache.juneau.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.transform.*;
@@ -33,77 +32,6 @@ import org.apache.juneau.transform.*;
public @interface Pojo {
/**
- * An identifying name for this class.
- * <p>
- * The name is used to identify the class type during parsing when it cannot be inferred through reflection.
- * For example, if a bean property is of type <code>Object</code>, then the serializer will add the name to the
- * output so that the class can be determined during parsing.
- * It is also used to specify element names in XML.
- * <p>
- * The name is used in combination with the lexicon defined through {@link #classLexicon()}. Together, they make up
- * a simple name/value mapping of names to classes.
- * Names do not need to be universally unique. However, they must be unique within a lexicon.
- *
- * <dl>
- * <dt>Example:</dt>
- * <dd>
- * <p class='bcode'>
- * <ja>@Bean</ja>(name=<js>"foo"</js>)
- * <jk>public class</jk> Foo {
- * <jc>// A bean property where the object types cannot be inferred since it's an Object[].</jc>
- * <ja>@BeanProperty</ja>(lexicon={Bar.<jk>class</jk>,Baz.<jk>class</jk>})
- * <jk>public</jk> Object[] x = <jk>new</jk> Object[]{<jk>new</jk> Bar(), <jk>new</jk> Baz()};
- * }
- *
- * <ja>@Pojo</ja>(name=<js>"bar"</js>)
- * <jk>public class</jk> Bar <jk>extends</jk> HashMap {}
- *
- * <ja>@Pojo</ja>(name=<js>"baz"</js>)
- * <jk>public class</jk> Baz <jk>extends</jk> HashMap {}
- * </p>
- * <p>
- * When serialized as XML, the bean is rendered as:
- * </p>
- * <p class='bcode'>
- * <xt><foo></xt>
- * <xt><x></xt>
- * <xt><bar/>v
- * <xt><baz/></xt>
- * <xt></x></xt>
- * <xt></foo></xt>
- * </p>
- * <p>
- * When serialized as JSON, <js>'n'</js> attributes would be added when needed to infer the type during parsing:
- * </p>
- * <p class='bcode'>
- * {
- * <jsa>x</jsa>: [
- * {<jsa>n</jsa>:<jss>'bar'</jss>},
- * {<jsa>n</jsa>:<jss>'baz'</jss>}
- * ]
- * } *
- * </dd>
- * </dl>
- */
- String name() default "";
-
- /**
- * The list of classes that make up the class lexicon for this class.
- * <p>
- * The lexicon is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.
- * The names are defined through the {@link #name()} annotation defined on the bean or POJO classes.
- * <p>
- * This list can consist of the following class types:
- * <ul>
- * <li>Any bean class that specifies a value for {@link Bean#name() @Bean.name()};
- * <li>Any POJO class that specifies a value for {@link Pojo#name() @Pojo.name()};
- * <li>Any subclass of {@link ClassLexicon} that defines an entire set of mappings.
- * Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.
- * </ul>
- */
- Class<?>[] classLexicon() default {};
-
- /**
* Associate a {@link PojoSwap} or {@link SurrogateSwap} with this class type.
*
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java
index 0f6cbdb..cc1b612 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Category.java
@@ -39,7 +39,7 @@ import org.apache.juneau.xml.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="category")
+@Bean(typeName="category")
public class Category extends Common {
private String term;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java
index 051d449..f5bf32d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Entry.java
@@ -47,7 +47,7 @@ import org.apache.juneau.transforms.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="entry")
+@Bean(typeName="entry")
public class Entry extends CommonEntry {
private Content content;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java
index a12c8d8..527df26 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Feed.java
@@ -52,7 +52,7 @@ import org.apache.juneau.xml.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="feed")
+@Bean(typeName="feed")
@SuppressWarnings("hiding")
public class Feed extends CommonEntry {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java
index 65be218..32b146c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Generator.java
@@ -37,7 +37,7 @@ import org.apache.juneau.xml.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="generator")
+@Bean(typeName="generator")
public class Generator extends Common {
private URI uri;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java
index 4736728..00b901a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Icon.java
@@ -35,7 +35,7 @@ import org.apache.juneau.xml.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="icon")
+@Bean(typeName="icon")
public class Icon extends Common {
private URI uri;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java
index 54950cf..f63f729 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Id.java
@@ -35,7 +35,7 @@ import org.apache.juneau.xml.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="id")
+@Bean(typeName="id")
public class Id extends Common {
private String text;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java
index 45d8e9f..f70f5ca 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Link.java
@@ -42,7 +42,7 @@ import org.apache.juneau.xml.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="link")
+@Bean(typeName="link")
public class Link extends Common {
private String href;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java
index 2866d53..b2b11f4 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/Logo.java
@@ -35,7 +35,7 @@ import org.apache.juneau.xml.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="logo")
+@Bean(typeName="logo")
public class Logo extends Common {
private URI uri;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java
index 2b8802b..0f21ab7 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/Column.java
@@ -27,7 +27,7 @@ import org.apache.juneau.xml.annotation.*;
* @author James Bognar (james.bognar@salesforce.com)
*/
@SuppressWarnings({"rawtypes","hiding"})
-@Bean(name="item",properties={"name","type","length"})
+@Bean(typeName="item",properties={"name","type","length"})
public class Column {
private String name, type;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
index 6932e58..0176bcf 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
@@ -75,7 +75,7 @@ import org.apache.juneau.xml.annotation.*;
* @author James Bognar (james.bognar@salesforce.com)
*/
@SuppressWarnings("unchecked")
-@Bean(name="dataset", properties={"metadata","data"})
+@Bean(typeName="dataset", properties={"metadata","data"})
public class DataSet {
private Column[] metaData;
@@ -136,7 +136,7 @@ public class DataSet {
*
* @author James Bognar (james.bognar@salesforce.com)
*/
- @Bean(name="row")
+ @Bean(typeName="row")
@Xml(childName="value")
public static class Row extends LinkedList<String> {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
index f135bc3..9196f1e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
@@ -29,7 +29,7 @@ import org.apache.juneau.transform.*;
* @author James Bognar (james.bognar@salesforce.com)
*/
@SuppressWarnings("hiding")
-@Bean(name="schema",
+@Bean(typeName="schema",
properties={"id","$schema","$ref", "title","description","type","definitions","properties",
"patternProperties","dependencies","items","multipleOf","maximum","exclusiveMaximum",
"minimum","exclusiveMinimum","maxLength","minLength","pattern","additionalItems",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
index de5638f..4fefe0e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -67,14 +67,14 @@ public final class HtmlParser extends ReaderParser {
* Precondition: Must be pointing at START_ELEMENT or CHARACTERS event.
* Postcondition: Pointing at next event to be processed.
*/
- private <T> T parseAnything(HtmlParserSession session, ClassMeta<T> nt, XMLEventReader r, Object outer) throws Exception {
+ private <T> T parseAnything(HtmlParserSession session, ClassMeta<T> eType, XMLEventReader r, Object outer) throws Exception {
BeanContext bc = session.getBeanContext();
- if (nt == null)
- nt = (ClassMeta<T>)object();
- PojoSwap<T,Object> transform = (PojoSwap<T,Object>)nt.getPojoSwap();
- ClassMeta<?> ft = nt.getSerializedClassMeta();
- session.setCurrentClass(ft);
+ if (eType == null)
+ eType = (ClassMeta<T>)object();
+ PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap();
+ ClassMeta<?> sType = eType.getSerializedClassMeta();
+ session.setCurrentClass(sType);
Object o = null;
@@ -83,26 +83,26 @@ public final class HtmlParser extends ReaderParser {
event = r.nextEvent();
if (event.isEndDocument())
- throw new XMLStreamException("Unexpected end of stream in parseAnything for type '"+nt+"'", event.getLocation());
+ throw new XMLStreamException("Unexpected end of stream in parseAnything for type '"+eType+"'", event.getLocation());
if (event.isCharacters()) {
String text = parseCharacters(event, r);
- if (ft.isObject())
+ if (sType.isObject())
o = text;
- else if (ft.isCharSequence())
+ else if (sType.isCharSequence())
o = text;
- else if (ft.isNumber())
- o = parseNumber(text, (Class<? extends Number>)nt.getInnerClass());
- else if (ft.isChar())
+ else if (sType.isNumber())
+ o = parseNumber(text, (Class<? extends Number>)eType.getInnerClass());
+ else if (sType.isChar())
o = text.charAt(0);
- else if (ft.isBoolean())
+ else if (sType.isBoolean())
o = Boolean.parseBoolean(text);
- else if (ft.canCreateNewInstanceFromString(outer))
- o = ft.newInstanceFromString(outer, text);
- else if (ft.canCreateNewInstanceFromNumber(outer))
- o = ft.newInstanceFromNumber(outer, parseNumber(text, ft.getNewInstanceFromNumberClass()));
+ else if (sType.canCreateNewInstanceFromString(outer))
+ o = sType.newInstanceFromString(outer, text);
+ else if (sType.canCreateNewInstanceFromNumber(outer))
+ o = sType.newInstanceFromNumber(outer, parseNumber(text, sType.getNewInstanceFromNumberClass()));
else
- throw new XMLStreamException("Unexpected characters '"+event.asCharacters().getData()+"' for type '"+nt+"'", event.getLocation());
+ throw new XMLStreamException("Unexpected characters '"+event.asCharacters().getData()+"' for type '"+eType+"'", event.getLocation());
} else {
Tag tag = Tag.forString(event.asStartElement().getName().getLocalPart(), false);
@@ -117,7 +117,7 @@ public final class HtmlParser extends ReaderParser {
tableType = attrs.get("type");
String c = attrs.get("_class");
if (c != null)
- ft = nt = (ClassMeta<T>)bc.getClassMetaFromString(c);
+ sType = eType = (ClassMeta<T>)bc.getClassMetaFromString(c);
}
boolean isValid = true;
@@ -125,8 +125,8 @@ public final class HtmlParser extends ReaderParser {
if (tag == NULL)
nextTag(r, xNULL);
else if (tag == A)
- o = parseAnchor(session, event, r, nt);
- else if (ft.isObject()) {
+ o = parseAnchor(session, event, r, eType);
+ else if (sType.isObject()) {
if (tag == STRING)
o = text;
else if (tag == NUMBER)
@@ -135,70 +135,70 @@ public final class HtmlParser extends ReaderParser {
o = Boolean.parseBoolean(text);
else if (tag == TABLE) {
if (tableType.equals("object")) {
- o = parseIntoMap(session, r, (Map)new ObjectMap(bc), ft.getKeyType(), ft.getValueType());
+ o = parseIntoMap(session, r, (Map)new ObjectMap(bc), sType.getKeyType(), sType.getValueType());
} else if (tableType.equals("array")) {
- o = parseTableIntoCollection(session, r, (Collection)new ObjectList(bc), ft.getElementType());
+ o = parseTableIntoCollection(session, r, (Collection)new ObjectList(bc), sType.getElementType());
} else
isValid = false;
}
else if (tag == UL)
o = parseIntoCollection(session, r, new ObjectList(bc), null);
}
- else if (tag == STRING && ft.isCharSequence())
+ else if (tag == STRING && sType.isCharSequence())
o = text;
- else if (tag == STRING && ft.isChar())
+ else if (tag == STRING && sType.isChar())
o = text.charAt(0);
- else if (tag == STRING && ft.canCreateNewInstanceFromString(outer))
- o = ft.newInstanceFromString(outer, text);
- else if (tag == NUMBER && ft.isNumber())
- o = parseNumber(text, (Class<? extends Number>)ft.getInnerClass());
- else if (tag == NUMBER && ft.canCreateNewInstanceFromNumber(outer))
- o = ft.newInstanceFromNumber(outer, parseNumber(text, ft.getNewInstanceFromNumberClass()));
- else if (tag == BOOLEAN && ft.isBoolean())
+ else if (tag == STRING && sType.canCreateNewInstanceFromString(outer))
+ o = sType.newInstanceFromString(outer, text);
+ else if (tag == NUMBER && sType.isNumber())
+ o = parseNumber(text, (Class<? extends Number>)sType.getInnerClass());
+ else if (tag == NUMBER && sType.canCreateNewInstanceFromNumber(outer))
+ o = sType.newInstanceFromNumber(outer, parseNumber(text, sType.getNewInstanceFromNumberClass()));
+ else if (tag == BOOLEAN && sType.isBoolean())
o = Boolean.parseBoolean(text);
else if (tag == TABLE) {
if (tableType.equals("object")) {
- if (ft.isMap()) {
- o = parseIntoMap(session, r, (Map)(ft.canCreateNewInstance(outer) ? ft.newInstance(outer) : new ObjectMap(bc)), ft.getKeyType(), ft.getValueType());
- } else if (ft.canCreateNewInstanceFromObjectMap(outer)) {
+ if (sType.isMap()) {
+ o = parseIntoMap(session, r, (Map)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectMap(bc)), sType.getKeyType(), sType.getValueType());
+ } else if (sType.canCreateNewInstanceFromObjectMap(outer)) {
ObjectMap m = new ObjectMap(bc);
parseIntoMap(session, r, m, string(), object());
- o = ft.newInstanceFromObjectMap(outer, m);
- } else if (ft.canCreateNewBean(outer)) {
- BeanMap m = bc.newBeanMap(outer, ft.getInnerClass());
+ o = sType.newInstanceFromObjectMap(outer, m);
+ } else if (sType.canCreateNewBean(outer)) {
+ BeanMap m = bc.newBeanMap(outer, sType.getInnerClass());
o = parseIntoBean(session, r, m).getBean();
}
else
isValid = false;
} else if (tableType.equals("array")) {
- if (ft.isCollection())
- o = parseTableIntoCollection(session, r, (Collection)(ft.canCreateNewInstance(outer) ? ft.newInstance(outer) : new ObjectList(bc)), ft.getElementType());
- else if (ft.isArray())
- o = bc.toArray(ft, parseTableIntoCollection(session, r, new ArrayList(), ft.getElementType()));
+ if (sType.isCollection())
+ o = parseTableIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectList(bc)), sType.getElementType());
+ else if (sType.isArray())
+ o = bc.toArray(sType, parseTableIntoCollection(session, r, new ArrayList(), sType.getElementType()));
else
isValid = false;
} else
isValid = false;
} else if (tag == UL) {
- if (ft.isCollection())
- o = parseIntoCollection(session, r, (Collection)(ft.canCreateNewInstance(outer) ? ft.newInstance(outer) : new ObjectList(bc)), ft.getElementType());
- else if (ft.isArray())
- o = bc.toArray(ft, parseIntoCollection(session, r, new ArrayList(), ft.getElementType()));
+ if (sType.isCollection())
+ o = parseIntoCollection(session, r, (Collection)(sType.canCreateNewInstance(outer) ? sType.newInstance(outer) : new ObjectList(bc)), sType.getElementType());
+ else if (sType.isArray())
+ o = bc.toArray(sType, parseIntoCollection(session, r, new ArrayList(), sType.getElementType()));
else
isValid = false;
} else
isValid = false;
if (! isValid)
- throw new XMLStreamException("Unexpected tag '"+tag+"' for type '"+nt+"'", event.getLocation());
+ throw new XMLStreamException("Unexpected tag '"+tag+"' for type '"+eType+"'", event.getLocation());
}
if (transform != null && o != null)
- o = transform.unswap(o, nt, bc);
+ o = transform.unswap(o, eType, bc);
if (outer != null)
- setParent(nt, o, outer);
+ setParent(eType, o, outer);
return (T)o;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index a4f4bbe..d0dc0a5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -94,22 +94,22 @@ public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
ObjectMap out = new ObjectMap();
ClassMeta<?> aType; // The actual type (will be null if recursion occurs)
- ClassMeta<?> gType; // The generic type
+ ClassMeta<?> sType; // The serialized type
aType = session.push(attrName, eType, null);
- gType = eType.getSerializedClassMeta();
+ sType = eType.getSerializedClassMeta();
String type = null;
- if (gType.isEnum() || gType.isCharSequence() || gType.isChar())
+ if (sType.isEnum() || sType.isCharSequence() || sType.isChar())
type = "string";
- else if (gType.isNumber())
+ else if (sType.isNumber())
type = "number";
- else if (gType.isBoolean())
+ else if (sType.isBoolean())
type = "boolean";
- else if (gType.isBean() || gType.isMap())
+ else if (sType.isBean() || sType.isMap())
type = "object";
- else if (gType.isCollection() || gType.isArray())
+ else if (sType.isCollection() || sType.isArray())
type = "array";
else
type = "any";
@@ -121,16 +121,16 @@ public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
out.put("transform", t);
if (aType != null) {
- if (gType.isEnum())
- out.put("enum", getEnumStrings((Class<Enum<?>>)gType.getInnerClass()));
- else if (gType.isCollection() || gType.isArray()) {
- ClassMeta componentType = gType.getElementType();
- if (gType.isCollection() && isParentClass(Set.class, gType.getInnerClass()))
+ if (sType.isEnum())
+ out.put("enum", getEnumStrings((Class<Enum<?>>)sType.getInnerClass()));
+ else if (sType.isCollection() || sType.isArray()) {
+ ClassMeta componentType = sType.getElementType();
+ if (sType.isCollection() && isParentClass(Set.class, sType.getInnerClass()))
out.put("uniqueItems", true);
out.put("items", getSchema(session, componentType, "items", pNames));
- } else if (gType.isBean()) {
+ } else if (sType.isBean()) {
ObjectMap properties = new ObjectMap();
- BeanMeta bm = session.getBeanContext().getBeanMeta(gType.getInnerClass());
+ BeanMeta bm = session.getBeanContext().getBeanMeta(sType.getInnerClass());
if (pNames != null)
bm = new BeanMetaFiltered(bm, pNames);
for (Iterator<BeanPropertyMeta> i = bm.getPropertyMetas().iterator(); i.hasNext();) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 869498a..4cfaf89 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -2,7 +2,7 @@
// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
-// * with the License. You may obtain a copy of the License at *
+// * with the License. You may obtain a copy of the License at *
// * *
// * http://www.apache.org/licenses/LICENSE-2.0 *
// * *
@@ -195,7 +195,7 @@ public class HtmlSerializer extends XmlSerializer {
BeanContext bc = session.getBeanContext();
ClassMeta<?> aType = null; // The actual type
- ClassMeta<?> gType = object(); // The generic type
+ ClassMeta<?> sType = object(); // The serialized type
if (eType == null)
eType = object();
@@ -216,7 +216,7 @@ public class HtmlSerializer extends XmlSerializer {
out.tag(i, "null").nl();
else {
- gType = aType.getSerializedClassMeta();
+ sType = aType.getSerializedClassMeta();
String classAttr = null;
if (session.isAddClassAttrs() && ! eType.equals(aType))
classAttr = aType.toString();
@@ -228,45 +228,45 @@ public class HtmlSerializer extends XmlSerializer {
// If the getSwapClass() method returns Object, we need to figure out
// the actual type now.
- if (gType.isObject())
- gType = bc.getClassMetaForObject(o);
+ if (sType.isObject())
+ sType = bc.getClassMetaForObject(o);
}
- HtmlClassMeta html = gType.getExtendedMeta(HtmlClassMeta.class);
+ HtmlClassMeta html = sType.getExtendedMeta(HtmlClassMeta.class);
if (html.isAsXml() || (pMeta != null && pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isAsXml()))
super.serializeAnything(session, out, o, null, null, null, false, XmlFormat.NORMAL, null);
else if (html.isAsPlainText() || (pMeta != null && pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isAsPlainText()))
out.write(o == null ? "null" : o.toString());
- else if (o == null || (gType.isChar() && ((Character)o).charValue() == 0))
+ else if (o == null || (sType.isChar() && ((Character)o).charValue() == 0))
out.tag(i, "null").nl();
- else if (gType.hasToObjectMapMethod())
- serializeMap(session, out, gType.toObjectMap(o), eType, classAttr, pMeta);
- else if (gType.isBean())
+ else if (sType.hasToObjectMapMethod())
+ serializeMap(session, out, sType.toObjectMap(o), eType, classAttr, pMeta);
+ else if (sType.isBean())
serializeBeanMap(session, out, bc.forBean(o), classAttr, pMeta);
- else if (gType.isNumber())
+ else if (sType.isNumber())
out.sTag(i, "number").append(o).eTag("number").nl();
- else if (gType.isBoolean())
+ else if (sType.isBoolean())
out.sTag(i, "boolean").append(o).eTag("boolean").nl();
- else if (gType.isMap()) {
+ else if (sType.isMap()) {
if (o instanceof BeanMap)
serializeBeanMap(session, out, (BeanMap)o, classAttr, pMeta);
else
serializeMap(session, out, (Map)o, eType, classAttr, pMeta);
}
- else if (gType.isCollection()) {
+ else if (sType.isCollection()) {
if (classAttr != null)
- serializeCollection(session, out, (Collection)o, gType, name, classAttr, pMeta);
+ serializeCollection(session, out, (Collection)o, sType, name, classAttr, pMeta);
else
serializeCollection(session, out, (Collection)o, eType, name, null, pMeta);
}
- else if (gType.isArray()) {
+ else if (sType.isArray()) {
if (classAttr != null)
- serializeCollection(session, out, toList(gType.getInnerClass(), o), gType, name, classAttr, pMeta);
+ serializeCollection(session, out, toList(sType.getInnerClass(), o), sType, name, classAttr, pMeta);
else
- serializeCollection(session, out, toList(gType.getInnerClass(), o), eType, name, null, pMeta);
+ serializeCollection(session, out, toList(sType.getInnerClass(), o), eType, name, null, pMeta);
}
- else if (session.isUri(gType, pMeta, o)) {
+ else if (session.isUri(sType, pMeta, o)) {
String label = session.getAnchorText(pMeta, o);
out.oTag(i, "a").attrUri("href", o).append('>');
out.append(label);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java
index 5e3ffc1..0ea319a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/A.java
@@ -23,7 +23,7 @@ import org.apache.juneau.xml.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="a")
+@Bean(typeName="a")
@SuppressWarnings("javadoc")
public class A extends HtmlElement {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java
index 5a3b6c5..dc81fea 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Abbr.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="abbr")
+@Bean(typeName="abbr")
public class Abbr extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java
index db14434..2844a3c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Address.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="address")
+@Bean(typeName="address")
public class Address extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java
index a139618..66e82d6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Area.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="area")
+@Bean(typeName="area")
public class Area extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java
index 6b56e46..2f87aa2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Article.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="article")
+@Bean(typeName="article")
public class Article extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java
index 7105b99..23ffa64 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Aside.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="aside")
+@Bean(typeName="aside")
public class Aside extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java
index 0172838..1ef40c2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Audio.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="audio")
+@Bean(typeName="audio")
public class Audio extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java
index de10358..449eefe 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/B.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="b")
+@Bean(typeName="b")
public class B extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java
index d31fda0..4a92761 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Base.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="base")
+@Bean(typeName="base")
public class Base extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java
index c76c47a..ce9796a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdi.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="bdi")
+@Bean(typeName="bdi")
public class Bdi extends HtmlElement {
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java
index 4415f76..0b3417d 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Bdo.java
@@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*;
*
* @author James Bognar (james.bognar@salesforce.com)
*/
-@Bean(name="bdo")
+@Bean(typeName="bdo")
public class Bdo extends HtmlElement {
}