http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html index cd729e5..f94cc33 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html +++ b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyValue.html @@ -24,65 +24,73 @@ <span class="sourceLineNo">016</span> * Represents a simple bean property value and the meta-data associated with it.<a name="line.16"></a> <span class="sourceLineNo">017</span> * <p><a name="line.17"></a> <span class="sourceLineNo">018</span> */<a name="line.18"></a> -<span class="sourceLineNo">019</span>public class BeanPropertyValue {<a name="line.19"></a> +<span class="sourceLineNo">019</span>public class BeanPropertyValue implements Comparable<BeanPropertyValue> {<a name="line.19"></a> <span class="sourceLineNo">020</span><a name="line.20"></a> <span class="sourceLineNo">021</span> private final BeanPropertyMeta pMeta;<a name="line.21"></a> -<span class="sourceLineNo">022</span> private final Object value;<a name="line.22"></a> -<span class="sourceLineNo">023</span> private final Throwable thrown;<a name="line.23"></a> -<span class="sourceLineNo">024</span><a name="line.24"></a> -<span class="sourceLineNo">025</span> /**<a name="line.25"></a> -<span class="sourceLineNo">026</span> * Constructor.<a name="line.26"></a> -<span class="sourceLineNo">027</span> *<a name="line.27"></a> -<span class="sourceLineNo">028</span> * @param pMeta The bean property metadata.<a name="line.28"></a> -<span class="sourceLineNo">029</span> * @param value The bean property value.<a name="line.29"></a> -<span class="sourceLineNo">030</span> * @param thrown The exception thrown by calling the property getter.<a name="line.30"></a> -<span class="sourceLineNo">031</span> */<a name="line.31"></a> -<span class="sourceLineNo">032</span> public BeanPropertyValue(BeanPropertyMeta pMeta, Object value, Throwable thrown) {<a name="line.32"></a> -<span class="sourceLineNo">033</span> this.pMeta = pMeta;<a name="line.33"></a> -<span class="sourceLineNo">034</span> this.value = value;<a name="line.34"></a> -<span class="sourceLineNo">035</span> this.thrown = thrown;<a name="line.35"></a> -<span class="sourceLineNo">036</span> }<a name="line.36"></a> -<span class="sourceLineNo">037</span><a name="line.37"></a> -<span class="sourceLineNo">038</span> /**<a name="line.38"></a> -<span class="sourceLineNo">039</span> * Returns the bean property metadata.<a name="line.39"></a> -<span class="sourceLineNo">040</span> * @return The bean property metadata.<a name="line.40"></a> -<span class="sourceLineNo">041</span> */<a name="line.41"></a> -<span class="sourceLineNo">042</span> public final BeanPropertyMeta getMeta() {<a name="line.42"></a> -<span class="sourceLineNo">043</span> return pMeta;<a name="line.43"></a> -<span class="sourceLineNo">044</span> }<a name="line.44"></a> -<span class="sourceLineNo">045</span><a name="line.45"></a> -<span class="sourceLineNo">046</span> /**<a name="line.46"></a> -<span class="sourceLineNo">047</span> * Returns the bean property metadata.<a name="line.47"></a> -<span class="sourceLineNo">048</span> * @return The bean property metadata.<a name="line.48"></a> -<span class="sourceLineNo">049</span> */<a name="line.49"></a> -<span class="sourceLineNo">050</span> public final ClassMeta<?> getClassMeta() {<a name="line.50"></a> -<span class="sourceLineNo">051</span> return pMeta.getClassMeta();<a name="line.51"></a> -<span class="sourceLineNo">052</span> }<a name="line.52"></a> -<span class="sourceLineNo">053</span><a name="line.53"></a> -<span class="sourceLineNo">054</span> /**<a name="line.54"></a> -<span class="sourceLineNo">055</span> * Returns the bean property name.<a name="line.55"></a> -<span class="sourceLineNo">056</span> * @return The bean property name.<a name="line.56"></a> -<span class="sourceLineNo">057</span> */<a name="line.57"></a> -<span class="sourceLineNo">058</span> public final String getName() {<a name="line.58"></a> -<span class="sourceLineNo">059</span> return pMeta.getName();<a name="line.59"></a> -<span class="sourceLineNo">060</span> }<a name="line.60"></a> -<span class="sourceLineNo">061</span><a name="line.61"></a> -<span class="sourceLineNo">062</span> /**<a name="line.62"></a> -<span class="sourceLineNo">063</span> * Returns the bean property value.<a name="line.63"></a> -<span class="sourceLineNo">064</span> * @return The bean property value.<a name="line.64"></a> -<span class="sourceLineNo">065</span> */<a name="line.65"></a> -<span class="sourceLineNo">066</span> public final Object getValue() {<a name="line.66"></a> -<span class="sourceLineNo">067</span> return value;<a name="line.67"></a> -<span class="sourceLineNo">068</span> }<a name="line.68"></a> -<span class="sourceLineNo">069</span><a name="line.69"></a> -<span class="sourceLineNo">070</span> /**<a name="line.70"></a> -<span class="sourceLineNo">071</span> * Returns the exception thrown by calling the property getter.<a name="line.71"></a> -<span class="sourceLineNo">072</span> * @return The exception thrown by calling the property getter.<a name="line.72"></a> -<span class="sourceLineNo">073</span> */<a name="line.73"></a> -<span class="sourceLineNo">074</span> public final Throwable getThrown() {<a name="line.74"></a> -<span class="sourceLineNo">075</span> return thrown;<a name="line.75"></a> -<span class="sourceLineNo">076</span> }<a name="line.76"></a> -<span class="sourceLineNo">077</span>}<a name="line.77"></a> +<span class="sourceLineNo">022</span> private final String name;<a name="line.22"></a> +<span class="sourceLineNo">023</span> private final Object value;<a name="line.23"></a> +<span class="sourceLineNo">024</span> private final Throwable thrown;<a name="line.24"></a> +<span class="sourceLineNo">025</span><a name="line.25"></a> +<span class="sourceLineNo">026</span> /**<a name="line.26"></a> +<span class="sourceLineNo">027</span> * Constructor.<a name="line.27"></a> +<span class="sourceLineNo">028</span> *<a name="line.28"></a> +<span class="sourceLineNo">029</span> * @param pMeta The bean property metadata.<a name="line.29"></a> +<span class="sourceLineNo">030</span> * @param name The bean property name.<a name="line.30"></a> +<span class="sourceLineNo">031</span> * @param value The bean property value.<a name="line.31"></a> +<span class="sourceLineNo">032</span> * @param thrown The exception thrown by calling the property getter.<a name="line.32"></a> +<span class="sourceLineNo">033</span> */<a name="line.33"></a> +<span class="sourceLineNo">034</span> public BeanPropertyValue(BeanPropertyMeta pMeta, String name, Object value, Throwable thrown) {<a name="line.34"></a> +<span class="sourceLineNo">035</span> this.pMeta = pMeta;<a name="line.35"></a> +<span class="sourceLineNo">036</span> this.name = name;<a name="line.36"></a> +<span class="sourceLineNo">037</span> this.value = value;<a name="line.37"></a> +<span class="sourceLineNo">038</span> this.thrown = thrown;<a name="line.38"></a> +<span class="sourceLineNo">039</span> }<a name="line.39"></a> +<span class="sourceLineNo">040</span><a name="line.40"></a> +<span class="sourceLineNo">041</span> /**<a name="line.41"></a> +<span class="sourceLineNo">042</span> * Returns the bean property metadata.<a name="line.42"></a> +<span class="sourceLineNo">043</span> * @return The bean property metadata.<a name="line.43"></a> +<span class="sourceLineNo">044</span> */<a name="line.44"></a> +<span class="sourceLineNo">045</span> public final BeanPropertyMeta getMeta() {<a name="line.45"></a> +<span class="sourceLineNo">046</span> return pMeta;<a name="line.46"></a> +<span class="sourceLineNo">047</span> }<a name="line.47"></a> +<span class="sourceLineNo">048</span><a name="line.48"></a> +<span class="sourceLineNo">049</span> /**<a name="line.49"></a> +<span class="sourceLineNo">050</span> * Returns the bean property metadata.<a name="line.50"></a> +<span class="sourceLineNo">051</span> * @return The bean property metadata.<a name="line.51"></a> +<span class="sourceLineNo">052</span> */<a name="line.52"></a> +<span class="sourceLineNo">053</span> public final ClassMeta<?> getClassMeta() {<a name="line.53"></a> +<span class="sourceLineNo">054</span> return pMeta.getClassMeta();<a name="line.54"></a> +<span class="sourceLineNo">055</span> }<a name="line.55"></a> +<span class="sourceLineNo">056</span><a name="line.56"></a> +<span class="sourceLineNo">057</span> /**<a name="line.57"></a> +<span class="sourceLineNo">058</span> * Returns the bean property name.<a name="line.58"></a> +<span class="sourceLineNo">059</span> * @return The bean property name.<a name="line.59"></a> +<span class="sourceLineNo">060</span> */<a name="line.60"></a> +<span class="sourceLineNo">061</span> public final String getName() {<a name="line.61"></a> +<span class="sourceLineNo">062</span> return name;<a name="line.62"></a> +<span class="sourceLineNo">063</span> }<a name="line.63"></a> +<span class="sourceLineNo">064</span><a name="line.64"></a> +<span class="sourceLineNo">065</span> /**<a name="line.65"></a> +<span class="sourceLineNo">066</span> * Returns the bean property value.<a name="line.66"></a> +<span class="sourceLineNo">067</span> * @return The bean property value.<a name="line.67"></a> +<span class="sourceLineNo">068</span> */<a name="line.68"></a> +<span class="sourceLineNo">069</span> public final Object getValue() {<a name="line.69"></a> +<span class="sourceLineNo">070</span> return value;<a name="line.70"></a> +<span class="sourceLineNo">071</span> }<a name="line.71"></a> +<span class="sourceLineNo">072</span><a name="line.72"></a> +<span class="sourceLineNo">073</span> /**<a name="line.73"></a> +<span class="sourceLineNo">074</span> * Returns the exception thrown by calling the property getter.<a name="line.74"></a> +<span class="sourceLineNo">075</span> * @return The exception thrown by calling the property getter.<a name="line.75"></a> +<span class="sourceLineNo">076</span> */<a name="line.76"></a> +<span class="sourceLineNo">077</span> public final Throwable getThrown() {<a name="line.77"></a> +<span class="sourceLineNo">078</span> return thrown;<a name="line.78"></a> +<span class="sourceLineNo">079</span> }<a name="line.79"></a> +<span class="sourceLineNo">080</span><a name="line.80"></a> +<span class="sourceLineNo">081</span> @Override /* Comparable */<a name="line.81"></a> +<span class="sourceLineNo">082</span> public int compareTo(BeanPropertyValue o) {<a name="line.82"></a> +<span class="sourceLineNo">083</span> return name.compareTo(o.name);<a name="line.83"></a> +<span class="sourceLineNo">084</span> }<a name="line.84"></a> +<span class="sourceLineNo">085</span>}<a name="line.85"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html b/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html index 06349e7..644aca7 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html +++ b/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html @@ -62,118 +62,187 @@ <span class="sourceLineNo">054</span> * <p><a name="line.54"></a> <span class="sourceLineNo">055</span> * If the {@link BeanContext#BEAN_beanFieldVisibility} setting on the bean context excludes this field (e.g. the visibility<a name="line.55"></a> <span class="sourceLineNo">056</span> * is set to PUBLIC, but the field is PROTECTED), this annotation can be used to force the field to be identified as a property.<a name="line.56"></a> -<span class="sourceLineNo">057</span> */<a name="line.57"></a> -<span class="sourceLineNo">058</span> String name() default "";<a name="line.58"></a> -<span class="sourceLineNo">059</span><a name="line.59"></a> -<span class="sourceLineNo">060</span> /**<a name="line.60"></a> -<span class="sourceLineNo">061</span> * Identifies a specialized class type for the property.<a name="line.61"></a> +<span class="sourceLineNo">057</span> * <p><a name="line.57"></a> +<span class="sourceLineNo">058</span> * <h6 class='topic'>Dynamic beans</h6><a name="line.58"></a> +<span class="sourceLineNo">059</span> * The bean property named <js>"*"</js> is the designated "dynamic property" which allows for "extra" bean properties not otherwise defined.<a name="line.59"></a> +<span class="sourceLineNo">060</span> * This is similar in concept to the Jackson <ja>@JsonGetterAll</ja> and <ja>@JsonSetterAll</ja> annotations.<a name="line.60"></a> +<span class="sourceLineNo">061</span> * The primary purpose is for backwards compatibility in parsing newer streams with addition information into older beans.<a name="line.61"></a> <span class="sourceLineNo">062</span> * <p><a name="line.62"></a> -<span class="sourceLineNo">063</span> * Normally this can be inferred through reflection of the field type or getter return type.<a name="line.63"></a> -<span class="sourceLineNo">064</span> * However, you'll want to specify this value if you're parsing beans where the bean property class<a name="line.64"></a> -<span class="sourceLineNo">065</span> * is an interface or abstract class to identify the bean type to instantiate. Otherwise, you may<a name="line.65"></a> -<span class="sourceLineNo">066</span> * cause an {@link InstantiationException} when trying to set these fields.<a name="line.66"></a> -<span class="sourceLineNo">067</span> * <p><a name="line.67"></a> -<span class="sourceLineNo">068</span> * This property must denote a concrete bean class with a no-arg constructor.<a name="line.68"></a> -<span class="sourceLineNo">069</span> *<a name="line.69"></a> -<span class="sourceLineNo">070</span> * <h5 class='section'>Example:</h5><a name="line.70"></a> -<span class="sourceLineNo">071</span> * <p class='bcode'><a name="line.71"></a> -<span class="sourceLineNo">072</span> * <jk>public class</jk> MyBean {<a name="line.72"></a> -<span class="sourceLineNo">073</span> *<a name="line.73"></a> -<span class="sourceLineNo">074</span> * <jc>// Identify concrete map type.</jc><a name="line.74"></a> -<span class="sourceLineNo">075</span> * <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>)<a name="line.75"></a> -<span class="sourceLineNo">076</span> * <jk>public</jk> Map <jf>p1</jf>;<a name="line.76"></a> -<span class="sourceLineNo">077</span> * }<a name="line.77"></a> -<span class="sourceLineNo">078</span> * </p><a name="line.78"></a> -<span class="sourceLineNo">079</span> */<a name="line.79"></a> -<span class="sourceLineNo">080</span> Class<?> type() default Object.class;<a name="line.80"></a> -<span class="sourceLineNo">081</span><a name="line.81"></a> -<span class="sourceLineNo">082</span> /**<a name="line.82"></a> -<span class="sourceLineNo">083</span> * For bean properties of maps and collections, this annotation can be used to identify<a name="line.83"></a> -<span class="sourceLineNo">084</span> * the class types of the contents of the bean property object when the generic parameter<a name="line.84"></a> -<span class="sourceLineNo">085</span> * types are interfaces or abstract classes.<a name="line.85"></a> -<span class="sourceLineNo">086</span> *<a name="line.86"></a> -<span class="sourceLineNo">087</span> * <h5 class='section'>Example:</h5><a name="line.87"></a> -<span class="sourceLineNo">088</span> * <p class='bcode'><a name="line.88"></a> -<span class="sourceLineNo">089</span> * <jk>public class</jk> MyBean {<a name="line.89"></a> -<span class="sourceLineNo">090</span> *<a name="line.90"></a> -<span class="sourceLineNo">091</span> * <jc>// Identify concrete map type with String keys and Integer values.</jc><a name="line.91"></a> -<span class="sourceLineNo">092</span> * <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>, params={String.<jk>class</jk>,Integer.<jk>class</jk>})<a name="line.92"></a> -<span class="sourceLineNo">093</span> * <jk>public</jk> Map <jf>p1</jf>;<a name="line.93"></a> -<span class="sourceLineNo">094</span> * }<a name="line.94"></a> -<span class="sourceLineNo">095</span> * </p><a name="line.95"></a> -<span class="sourceLineNo">096</span> */<a name="line.96"></a> -<span class="sourceLineNo">097</span> Class<?>[] params() default {};<a name="line.97"></a> -<span class="sourceLineNo">098</span><a name="line.98"></a> -<span class="sourceLineNo">099</span> /**<a name="line.99"></a> -<span class="sourceLineNo">100</span> * Associates a {@link PojoSwap} or {@link SurrogateSwap} with this bean property that will swap the value object<a name="line.100"></a> -<span class="sourceLineNo">101</span> * with another object during serialization and parsing.<a name="line.101"></a> -<span class="sourceLineNo">102</span> * <p><a name="line.102"></a> -<span class="sourceLineNo">103</span> * This annotation supersedes any swaps associated with the bean property type<a name="line.103"></a> -<span class="sourceLineNo">104</span> * class itself.<a name="line.104"></a> -<span class="sourceLineNo">105</span> * <p><a name="line.105"></a> -<span class="sourceLineNo">106</span> * Typically used for rendering {@link Date Dates} and {@link Calendar Calendars}<a name="line.106"></a> -<span class="sourceLineNo">107</span> * as a particular string format.<a name="line.107"></a> -<span class="sourceLineNo">108</span> *<a name="line.108"></a> -<span class="sourceLineNo">109</span> * <h5 class='section'>Example:</h5><a name="line.109"></a> -<span class="sourceLineNo">110</span> * <p class='bcode'><a name="line.110"></a> -<span class="sourceLineNo">111</span> * <jk>public class</jk> MyClass {<a name="line.111"></a> +<span class="sourceLineNo">063</span> * The following examples show how to define dynamic bean properties.<a name="line.63"></a> +<span class="sourceLineNo">064</span> * <p class='bcode'><a name="line.64"></a> +<span class="sourceLineNo">065</span> * <jc>// Option #1 - A simple public Map field.<a name="line.65"></a> +<span class="sourceLineNo">066</span> * // The field name can be anything.</jc><a name="line.66"></a> +<span class="sourceLineNo">067</span> * <jk>public class</jk> BeanWithDynaField {<a name="line.67"></a> +<span class="sourceLineNo">068</span> *<a name="line.68"></a> +<span class="sourceLineNo">069</span> * <ja>@BeanProperty</ja>(name=<js>"*"</js>)<a name="line.69"></a> +<span class="sourceLineNo">070</span> * <jk>public</jk> Map&lt;String,Object&gt; extraStuff = <jk>new</jk> LinkedHashMap&lt;String,Object&gt;();<a name="line.70"></a> +<span class="sourceLineNo">071</span> * }<a name="line.71"></a> +<span class="sourceLineNo">072</span> *<a name="line.72"></a> +<span class="sourceLineNo">073</span> * <jc>// Option #2 - Getters and setters.<a name="line.73"></a> +<span class="sourceLineNo">074</span> * // Method names can be anything.<a name="line.74"></a> +<span class="sourceLineNo">075</span> * // Getter must return a Map with String keys.<a name="line.75"></a> +<span class="sourceLineNo">076</span> * // Setter must take in two arguments.</jc><a name="line.76"></a> +<span class="sourceLineNo">077</span> * <jk>public class</jk> BeanWithDynaMethods {<a name="line.77"></a> +<span class="sourceLineNo">078</span> *<a name="line.78"></a> +<span class="sourceLineNo">079</span> * <ja>@BeanProperty</ja>(name=<js>"*"</js>)<a name="line.79"></a> +<span class="sourceLineNo">080</span> * <jk>public</jk> Map&lt;String,Object&gt; getMyExtraStuff() {<a name="line.80"></a> +<span class="sourceLineNo">081</span> * ...<a name="line.81"></a> +<span class="sourceLineNo">082</span> * }<a name="line.82"></a> +<span class="sourceLineNo">083</span> *<a name="line.83"></a> +<span class="sourceLineNo">084</span> * <ja>@BeanProperty</ja>(name=<js>"*"</js>)<a name="line.84"></a> +<span class="sourceLineNo">085</span> * <jk>public void</jk> setAnExtraField(String name, Object value) {<a name="line.85"></a> +<span class="sourceLineNo">086</span> * ...<a name="line.86"></a> +<span class="sourceLineNo">087</span> * }<a name="line.87"></a> +<span class="sourceLineNo">088</span> * }<a name="line.88"></a> +<span class="sourceLineNo">089</span> *<a name="line.89"></a> +<span class="sourceLineNo">090</span> * <jc>// Option #3 - Getter only.<a name="line.90"></a> +<span class="sourceLineNo">091</span> * // Properties will be added through the getter.</jc><a name="line.91"></a> +<span class="sourceLineNo">092</span> * <jk>public class</jk> BeanWithDynaGetterOnly {<a name="line.92"></a> +<span class="sourceLineNo">093</span> *<a name="line.93"></a> +<span class="sourceLineNo">094</span> * <ja>@BeanProperty</ja>(name=<js>"*"</js>)<a name="line.94"></a> +<span class="sourceLineNo">095</span> * <jk>public</jk> Map&lt;String,Object&gt; getMyExtraStuff() {<a name="line.95"></a> +<span class="sourceLineNo">096</span> * ...<a name="line.96"></a> +<span class="sourceLineNo">097</span> * }<a name="line.97"></a> +<span class="sourceLineNo">098</span> * }<a name="line.98"></a> +<span class="sourceLineNo">099</span> * </p><a name="line.99"></a> +<span class="sourceLineNo">100</span> * <p><a name="line.100"></a> +<span class="sourceLineNo">101</span> * Similar rules apply for value types and swaps. The property values optionally can be any serializable type<a name="line.101"></a> +<span class="sourceLineNo">102</span> * or use swaps.<a name="line.102"></a> +<span class="sourceLineNo">103</span> * <p class='bcode'><a name="line.103"></a> +<span class="sourceLineNo">104</span> * <jc>// A serializable type other than Object.</jc><a name="line.104"></a> +<span class="sourceLineNo">105</span> * <jk>public class</jk> BeanWithDynaFieldWithListValues {<a name="line.105"></a> +<span class="sourceLineNo">106</span> *<a name="line.106"></a> +<span class="sourceLineNo">107</span> * <ja>@BeanProperty</ja>(name=<js>"*"</js>)<a name="line.107"></a> +<span class="sourceLineNo">108</span> * <jk>public</jk> Map&lt;String,List&lt;String&gt;&gt; getMyExtraStuff() {<a name="line.108"></a> +<span class="sourceLineNo">109</span> * ...<a name="line.109"></a> +<span class="sourceLineNo">110</span> * }<a name="line.110"></a> +<span class="sourceLineNo">111</span> * }<a name="line.111"></a> <span class="sourceLineNo">112</span> *<a name="line.112"></a> -<span class="sourceLineNo">113</span> * <jc>// During serialization, convert to ISO8601 date-time string.</jc><a name="line.113"></a> -<span class="sourceLineNo">114</span> * <ja>@BeanProperty</ja>(pojoSwap=CalendarSwap.ISO8601DT.<jk>class</jk>)<a name="line.114"></a> -<span class="sourceLineNo">115</span> * <jk>public</jk> Calendar getTime();<a name="line.115"></a> -<span class="sourceLineNo">116</span> * }<a name="line.116"></a> -<span class="sourceLineNo">117</span> * </p><a name="line.117"></a> -<span class="sourceLineNo">118</span> */<a name="line.118"></a> -<span class="sourceLineNo">119</span> Class<?> swap() default Null.class;<a name="line.119"></a> -<span class="sourceLineNo">120</span><a name="line.120"></a> -<span class="sourceLineNo">121</span> /**<a name="line.121"></a> -<span class="sourceLineNo">122</span> * Used to limit which child properties are rendered by the serializers.<a name="line.122"></a> -<span class="sourceLineNo">123</span> * <p><a name="line.123"></a> -<span class="sourceLineNo">124</span> * Can be used on any of the following bean property types:<a name="line.124"></a> -<span class="sourceLineNo">125</span> * <ul class='spaced-list'><a name="line.125"></a> -<span class="sourceLineNo">126</span> * <li>Beans - Only render the specified properties of the bean.<a name="line.126"></a> -<span class="sourceLineNo">127</span> * <li>Maps - Only render the specified entries in the map.<a name="line.127"></a> -<span class="sourceLineNo">128</span> * <li>Bean/Map arrays - Same, but applied to each element in the array.<a name="line.128"></a> -<span class="sourceLineNo">129</span> * <li>Bean/Map collections - Same, but applied to each element in the collection.<a name="line.129"></a> -<span class="sourceLineNo">130</span> * </ul><a name="line.130"></a> -<span class="sourceLineNo">131</span> *<a name="line.131"></a> -<span class="sourceLineNo">132</span> * <h5 class='section'>Example:</h5><a name="line.132"></a> -<span class="sourceLineNo">133</span> * <p class='bcode'><a name="line.133"></a> -<span class="sourceLineNo">134</span> * <jk>public class</jk> MyClass {<a name="line.134"></a> -<span class="sourceLineNo">135</span> *<a name="line.135"></a> -<span class="sourceLineNo">136</span> * <jc>// Only render 'f1' when serializing this bean property.</jc><a name="line.136"></a> -<span class="sourceLineNo">137</span> * <ja>@BeanProperty</ja>(properties=<js>"f1"</js>)<a name="line.137"></a> -<span class="sourceLineNo">138</span> * <jk>public</jk> MyChildClass x1 = <jk>new</jk> MyChildClass();<a name="line.138"></a> -<span class="sourceLineNo">139</span> * }<a name="line.139"></a> -<span class="sourceLineNo">140</span> *<a name="line.140"></a> -<span class="sourceLineNo">141</span> * <jk>public class</jk> MyChildClass {<a name="line.141"></a> -<span class="sourceLineNo">142</span> * <jk>public int</jk> f1 = 1;<a name="line.142"></a> -<span class="sourceLineNo">143</span> * <jk>public int</jk> f2 = 2;<a name="line.143"></a> -<span class="sourceLineNo">144</span> * }<a name="line.144"></a> -<span class="sourceLineNo">145</span> *<a name="line.145"></a> -<span class="sourceLineNo">146</span> * <jc>// Renders "{x1:{f1:1}}"</jc><a name="line.146"></a> -<span class="sourceLineNo">147</span> * String json = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jk>new</jk> MyClass());<a name="line.147"></a> -<span class="sourceLineNo">148</span> * </p><a name="line.148"></a> -<span class="sourceLineNo">149</span> */<a name="line.149"></a> -<span class="sourceLineNo">150</span> String properties() default "";<a name="line.150"></a> -<span class="sourceLineNo">151</span><a name="line.151"></a> -<span class="sourceLineNo">152</span> /**<a name="line.152"></a> -<span class="sourceLineNo">153</span> * The list of classes that make up the bean dictionary for this bean property.<a name="line.153"></a> -<span class="sourceLineNo">154</span> * <p><a name="line.154"></a> -<span class="sourceLineNo">155</span> * The dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.<a name="line.155"></a> -<span class="sourceLineNo">156</span> * The names are defined through the {@link Bean#typeName()} annotation defined on the bean class.<a name="line.156"></a> -<span class="sourceLineNo">157</span> * <p><a name="line.157"></a> -<span class="sourceLineNo">158</span> * This list can consist of the following class types:<a name="line.158"></a> -<span class="sourceLineNo">159</span> * <ul><a name="line.159"></a> -<span class="sourceLineNo">160</span> * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.name()};<a name="line.160"></a> -<span class="sourceLineNo">161</span> * <li>Any subclass of {@link BeanDictionaryList} that defines an entire set of mappings.<a name="line.161"></a> -<span class="sourceLineNo">162</span> * Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.<a name="line.162"></a> -<span class="sourceLineNo">163</span> * <li>Any subclass of {@link BeanDictionaryMap} that defines an entire set of mappings.<a name="line.163"></a> -<span class="sourceLineNo">164</span> * Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.<a name="line.164"></a> -<span class="sourceLineNo">165</span> * </ul><a name="line.165"></a> -<span class="sourceLineNo">166</span> */<a name="line.166"></a> -<span class="sourceLineNo">167</span> Class<?>[] beanDictionary() default {};<a name="line.167"></a> -<span class="sourceLineNo">168</span>}<a name="line.168"></a> +<span class="sourceLineNo">113</span> * <jc>// A swapped value.</jc><a name="line.113"></a> +<span class="sourceLineNo">114</span> * <jk>public class</jk> BeanWithDynaFieldWithSwappedValues {<a name="line.114"></a> +<span class="sourceLineNo">115</span> *<a name="line.115"></a> +<span class="sourceLineNo">116</span> * <ja>@BeanProperty</ja>(name=<js>"*"</js>, swap=CalendarSwap.<jsf>ISO8601DTZ</jsf>.<jk>class</jk>)<a name="line.116"></a> +<span class="sourceLineNo">117</span> * <jk>public</jk> Map&lt;String,Calendar&gt; getMyExtraStuff() {<a name="line.117"></a> +<span class="sourceLineNo">118</span> * ...<a name="line.118"></a> +<span class="sourceLineNo">119</span> * }<a name="line.119"></a> +<span class="sourceLineNo">120</span> * }<a name="line.120"></a> +<span class="sourceLineNo">121</span> * </p><a name="line.121"></a> +<span class="sourceLineNo">122</span> * <p class='info'><a name="line.122"></a> +<span class="sourceLineNo">123</span> * Note that if you're not interested in these additional properties, you can also use the {@link BeanContext#BEAN_ignoreUnknownBeanProperties} setting<a name="line.123"></a> +<span class="sourceLineNo">124</span> * to ignore values that don't fit into existing properties.<a name="line.124"></a> +<span class="sourceLineNo">125</span> * </p><a name="line.125"></a> +<span class="sourceLineNo">126</span> */<a name="line.126"></a> +<span class="sourceLineNo">127</span> String name() default "";<a name="line.127"></a> +<span class="sourceLineNo">128</span><a name="line.128"></a> +<span class="sourceLineNo">129</span> /**<a name="line.129"></a> +<span class="sourceLineNo">130</span> * Identifies a specialized class type for the property.<a name="line.130"></a> +<span class="sourceLineNo">131</span> * <p><a name="line.131"></a> +<span class="sourceLineNo">132</span> * Normally this can be inferred through reflection of the field type or getter return type.<a name="line.132"></a> +<span class="sourceLineNo">133</span> * However, you'll want to specify this value if you're parsing beans where the bean property class<a name="line.133"></a> +<span class="sourceLineNo">134</span> * is an interface or abstract class to identify the bean type to instantiate. Otherwise, you may<a name="line.134"></a> +<span class="sourceLineNo">135</span> * cause an {@link InstantiationException} when trying to set these fields.<a name="line.135"></a> +<span class="sourceLineNo">136</span> * <p><a name="line.136"></a> +<span class="sourceLineNo">137</span> * This property must denote a concrete bean class with a no-arg constructor.<a name="line.137"></a> +<span class="sourceLineNo">138</span> *<a name="line.138"></a> +<span class="sourceLineNo">139</span> * <h5 class='section'>Example:</h5><a name="line.139"></a> +<span class="sourceLineNo">140</span> * <p class='bcode'><a name="line.140"></a> +<span class="sourceLineNo">141</span> * <jk>public class</jk> MyBean {<a name="line.141"></a> +<span class="sourceLineNo">142</span> *<a name="line.142"></a> +<span class="sourceLineNo">143</span> * <jc>// Identify concrete map type.</jc><a name="line.143"></a> +<span class="sourceLineNo">144</span> * <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>)<a name="line.144"></a> +<span class="sourceLineNo">145</span> * <jk>public</jk> Map <jf>p1</jf>;<a name="line.145"></a> +<span class="sourceLineNo">146</span> * }<a name="line.146"></a> +<span class="sourceLineNo">147</span> * </p><a name="line.147"></a> +<span class="sourceLineNo">148</span> */<a name="line.148"></a> +<span class="sourceLineNo">149</span> Class<?> type() default Object.class;<a name="line.149"></a> +<span class="sourceLineNo">150</span><a name="line.150"></a> +<span class="sourceLineNo">151</span> /**<a name="line.151"></a> +<span class="sourceLineNo">152</span> * For bean properties of maps and collections, this annotation can be used to identify<a name="line.152"></a> +<span class="sourceLineNo">153</span> * the class types of the contents of the bean property object when the generic parameter<a name="line.153"></a> +<span class="sourceLineNo">154</span> * types are interfaces or abstract classes.<a name="line.154"></a> +<span class="sourceLineNo">155</span> *<a name="line.155"></a> +<span class="sourceLineNo">156</span> * <h5 class='section'>Example:</h5><a name="line.156"></a> +<span class="sourceLineNo">157</span> * <p class='bcode'><a name="line.157"></a> +<span class="sourceLineNo">158</span> * <jk>public class</jk> MyBean {<a name="line.158"></a> +<span class="sourceLineNo">159</span> *<a name="line.159"></a> +<span class="sourceLineNo">160</span> * <jc>// Identify concrete map type with String keys and Integer values.</jc><a name="line.160"></a> +<span class="sourceLineNo">161</span> * <ja>@BeanProperty</ja>(type=HashMap.<jk>class</jk>, params={String.<jk>class</jk>,Integer.<jk>class</jk>})<a name="line.161"></a> +<span class="sourceLineNo">162</span> * <jk>public</jk> Map <jf>p1</jf>;<a name="line.162"></a> +<span class="sourceLineNo">163</span> * }<a name="line.163"></a> +<span class="sourceLineNo">164</span> * </p><a name="line.164"></a> +<span class="sourceLineNo">165</span> */<a name="line.165"></a> +<span class="sourceLineNo">166</span> Class<?>[] params() default {};<a name="line.166"></a> +<span class="sourceLineNo">167</span><a name="line.167"></a> +<span class="sourceLineNo">168</span> /**<a name="line.168"></a> +<span class="sourceLineNo">169</span> * Associates a {@link PojoSwap} or {@link SurrogateSwap} with this bean property that will swap the value object<a name="line.169"></a> +<span class="sourceLineNo">170</span> * with another object during serialization and parsing.<a name="line.170"></a> +<span class="sourceLineNo">171</span> * <p><a name="line.171"></a> +<span class="sourceLineNo">172</span> * This annotation supersedes any swaps associated with the bean property type<a name="line.172"></a> +<span class="sourceLineNo">173</span> * class itself.<a name="line.173"></a> +<span class="sourceLineNo">174</span> * <p><a name="line.174"></a> +<span class="sourceLineNo">175</span> * Typically used for rendering {@link Date Dates} and {@link Calendar Calendars}<a name="line.175"></a> +<span class="sourceLineNo">176</span> * as a particular string format.<a name="line.176"></a> +<span class="sourceLineNo">177</span> *<a name="line.177"></a> +<span class="sourceLineNo">178</span> * <h5 class='section'>Example:</h5><a name="line.178"></a> +<span class="sourceLineNo">179</span> * <p class='bcode'><a name="line.179"></a> +<span class="sourceLineNo">180</span> * <jk>public class</jk> MyClass {<a name="line.180"></a> +<span class="sourceLineNo">181</span> *<a name="line.181"></a> +<span class="sourceLineNo">182</span> * <jc>// During serialization, convert to ISO8601 date-time string.</jc><a name="line.182"></a> +<span class="sourceLineNo">183</span> * <ja>@BeanProperty</ja>(pojoSwap=CalendarSwap.ISO8601DT.<jk>class</jk>)<a name="line.183"></a> +<span class="sourceLineNo">184</span> * <jk>public</jk> Calendar getTime();<a name="line.184"></a> +<span class="sourceLineNo">185</span> * }<a name="line.185"></a> +<span class="sourceLineNo">186</span> * </p><a name="line.186"></a> +<span class="sourceLineNo">187</span> */<a name="line.187"></a> +<span class="sourceLineNo">188</span> Class<?> swap() default Null.class;<a name="line.188"></a> +<span class="sourceLineNo">189</span><a name="line.189"></a> +<span class="sourceLineNo">190</span> /**<a name="line.190"></a> +<span class="sourceLineNo">191</span> * Used to limit which child properties are rendered by the serializers.<a name="line.191"></a> +<span class="sourceLineNo">192</span> * <p><a name="line.192"></a> +<span class="sourceLineNo">193</span> * Can be used on any of the following bean property types:<a name="line.193"></a> +<span class="sourceLineNo">194</span> * <ul class='spaced-list'><a name="line.194"></a> +<span class="sourceLineNo">195</span> * <li>Beans - Only render the specified properties of the bean.<a name="line.195"></a> +<span class="sourceLineNo">196</span> * <li>Maps - Only render the specified entries in the map.<a name="line.196"></a> +<span class="sourceLineNo">197</span> * <li>Bean/Map arrays - Same, but applied to each element in the array.<a name="line.197"></a> +<span class="sourceLineNo">198</span> * <li>Bean/Map collections - Same, but applied to each element in the collection.<a name="line.198"></a> +<span class="sourceLineNo">199</span> * </ul><a name="line.199"></a> +<span class="sourceLineNo">200</span> *<a name="line.200"></a> +<span class="sourceLineNo">201</span> * <h5 class='section'>Example:</h5><a name="line.201"></a> +<span class="sourceLineNo">202</span> * <p class='bcode'><a name="line.202"></a> +<span class="sourceLineNo">203</span> * <jk>public class</jk> MyClass {<a name="line.203"></a> +<span class="sourceLineNo">204</span> *<a name="line.204"></a> +<span class="sourceLineNo">205</span> * <jc>// Only render 'f1' when serializing this bean property.</jc><a name="line.205"></a> +<span class="sourceLineNo">206</span> * <ja>@BeanProperty</ja>(properties=<js>"f1"</js>)<a name="line.206"></a> +<span class="sourceLineNo">207</span> * <jk>public</jk> MyChildClass x1 = <jk>new</jk> MyChildClass();<a name="line.207"></a> +<span class="sourceLineNo">208</span> * }<a name="line.208"></a> +<span class="sourceLineNo">209</span> *<a name="line.209"></a> +<span class="sourceLineNo">210</span> * <jk>public class</jk> MyChildClass {<a name="line.210"></a> +<span class="sourceLineNo">211</span> * <jk>public int</jk> f1 = 1;<a name="line.211"></a> +<span class="sourceLineNo">212</span> * <jk>public int</jk> f2 = 2;<a name="line.212"></a> +<span class="sourceLineNo">213</span> * }<a name="line.213"></a> +<span class="sourceLineNo">214</span> *<a name="line.214"></a> +<span class="sourceLineNo">215</span> * <jc>// Renders "{x1:{f1:1}}"</jc><a name="line.215"></a> +<span class="sourceLineNo">216</span> * String json = JsonSerializer.<jsf>DEFAULT</jsf>.serialize(<jk>new</jk> MyClass());<a name="line.216"></a> +<span class="sourceLineNo">217</span> * </p><a name="line.217"></a> +<span class="sourceLineNo">218</span> */<a name="line.218"></a> +<span class="sourceLineNo">219</span> String properties() default "";<a name="line.219"></a> +<span class="sourceLineNo">220</span><a name="line.220"></a> +<span class="sourceLineNo">221</span> /**<a name="line.221"></a> +<span class="sourceLineNo">222</span> * The list of classes that make up the bean dictionary for this bean property.<a name="line.222"></a> +<span class="sourceLineNo">223</span> * <p><a name="line.223"></a> +<span class="sourceLineNo">224</span> * The dictionary is a name/class mapping used to find class types during parsing when they cannot be inferred through reflection.<a name="line.224"></a> +<span class="sourceLineNo">225</span> * The names are defined through the {@link Bean#typeName()} annotation defined on the bean class.<a name="line.225"></a> +<span class="sourceLineNo">226</span> * <p><a name="line.226"></a> +<span class="sourceLineNo">227</span> * This list can consist of the following class types:<a name="line.227"></a> +<span class="sourceLineNo">228</span> * <ul><a name="line.228"></a> +<span class="sourceLineNo">229</span> * <li>Any bean class that specifies a value for {@link Bean#typeName() @Bean.name()};<a name="line.229"></a> +<span class="sourceLineNo">230</span> * <li>Any subclass of {@link BeanDictionaryList} that defines an entire set of mappings.<a name="line.230"></a> +<span class="sourceLineNo">231</span> * Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.<a name="line.231"></a> +<span class="sourceLineNo">232</span> * <li>Any subclass of {@link BeanDictionaryMap} that defines an entire set of mappings.<a name="line.232"></a> +<span class="sourceLineNo">233</span> * Note that the subclass MUST implement a no-arg constructor so that it can be instantiated.<a name="line.233"></a> +<span class="sourceLineNo">234</span> * </ul><a name="line.234"></a> +<span class="sourceLineNo">235</span> */<a name="line.235"></a> +<span class="sourceLineNo">236</span> Class<?>[] beanDictionary() default {};<a name="line.236"></a> +<span class="sourceLineNo">237</span>}<a name="line.237"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializer.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializer.html index 96303a9..6b0efec 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializer.html +++ b/content/site/apidocs/src-html/org/apache/juneau/csv/CsvSerializer.html @@ -65,49 +65,50 @@ <span class="sourceLineNo">057</span> } else {<a name="line.57"></a> <span class="sourceLineNo">058</span> l = (Collection)o;<a name="line.58"></a> <span class="sourceLineNo">059</span> }<a name="line.59"></a> -<span class="sourceLineNo">060</span> if (l.size() > 0) {<a name="line.60"></a> -<span class="sourceLineNo">061</span> ClassMeta entryType = session.getClassMetaForObject(l.iterator().next());<a name="line.61"></a> -<span class="sourceLineNo">062</span> if (entryType.isBean()) {<a name="line.62"></a> -<span class="sourceLineNo">063</span> BeanMeta<?> bm = entryType.getBeanMeta();<a name="line.63"></a> -<span class="sourceLineNo">064</span> int i = 0;<a name="line.64"></a> -<span class="sourceLineNo">065</span> for (BeanPropertyMeta pm : bm.getPropertyMetas()) {<a name="line.65"></a> -<span class="sourceLineNo">066</span> if (i++ > 0)<a name="line.66"></a> -<span class="sourceLineNo">067</span> out.append(',');<a name="line.67"></a> -<span class="sourceLineNo">068</span> append(out, pm.getName());<a name="line.68"></a> -<span class="sourceLineNo">069</span> }<a name="line.69"></a> -<span class="sourceLineNo">070</span> out.append('\n');<a name="line.70"></a> -<span class="sourceLineNo">071</span> for (Object o2 : l) {<a name="line.71"></a> -<span class="sourceLineNo">072</span> i = 0;<a name="line.72"></a> -<span class="sourceLineNo">073</span> BeanMap bean = session.toBeanMap(o2);<a name="line.73"></a> -<span class="sourceLineNo">074</span> for (BeanPropertyMeta pm : bm.getPropertyMetas()) {<a name="line.74"></a> -<span class="sourceLineNo">075</span> if (i++ > 0)<a name="line.75"></a> -<span class="sourceLineNo">076</span> out.append(',');<a name="line.76"></a> -<span class="sourceLineNo">077</span> append(out, pm.get(bean));<a name="line.77"></a> -<span class="sourceLineNo">078</span> }<a name="line.78"></a> -<span class="sourceLineNo">079</span> out.append('\n');<a name="line.79"></a> -<span class="sourceLineNo">080</span> }<a name="line.80"></a> -<span class="sourceLineNo">081</span> }<a name="line.81"></a> -<span class="sourceLineNo">082</span> }<a name="line.82"></a> -<span class="sourceLineNo">083</span> }<a name="line.83"></a> -<span class="sourceLineNo">084</span><a name="line.84"></a> -<span class="sourceLineNo">085</span> private static void append(Writer w, Object o) throws IOException {<a name="line.85"></a> -<span class="sourceLineNo">086</span> if (o == null)<a name="line.86"></a> -<span class="sourceLineNo">087</span> w.append("null");<a name="line.87"></a> -<span class="sourceLineNo">088</span> else {<a name="line.88"></a> -<span class="sourceLineNo">089</span> String s = o.toString();<a name="line.89"></a> -<span class="sourceLineNo">090</span> boolean mustQuote = false;<a name="line.90"></a> -<span class="sourceLineNo">091</span> for (int i = 0; i < s.length() && ! mustQuote; i++) {<a name="line.91"></a> -<span class="sourceLineNo">092</span> char c = s.charAt(i);<a name="line.92"></a> -<span class="sourceLineNo">093</span> if (Character.isWhitespace(c) || c == ',')<a name="line.93"></a> -<span class="sourceLineNo">094</span> mustQuote = true;<a name="line.94"></a> -<span class="sourceLineNo">095</span> }<a name="line.95"></a> -<span class="sourceLineNo">096</span> if (mustQuote)<a name="line.96"></a> -<span class="sourceLineNo">097</span> w.append('"').append(s).append('"');<a name="line.97"></a> -<span class="sourceLineNo">098</span> else<a name="line.98"></a> -<span class="sourceLineNo">099</span> w.append(s);<a name="line.99"></a> -<span class="sourceLineNo">100</span> }<a name="line.100"></a> -<span class="sourceLineNo">101</span> }<a name="line.101"></a> -<span class="sourceLineNo">102</span>}<a name="line.102"></a> +<span class="sourceLineNo">060</span> // TODO - Doesn't support DynaBeans.<a name="line.60"></a> +<span class="sourceLineNo">061</span> if (l.size() > 0) {<a name="line.61"></a> +<span class="sourceLineNo">062</span> ClassMeta entryType = session.getClassMetaForObject(l.iterator().next());<a name="line.62"></a> +<span class="sourceLineNo">063</span> if (entryType.isBean()) {<a name="line.63"></a> +<span class="sourceLineNo">064</span> BeanMeta<?> bm = entryType.getBeanMeta();<a name="line.64"></a> +<span class="sourceLineNo">065</span> int i = 0;<a name="line.65"></a> +<span class="sourceLineNo">066</span> for (BeanPropertyMeta pm : bm.getPropertyMetas()) {<a name="line.66"></a> +<span class="sourceLineNo">067</span> if (i++ > 0)<a name="line.67"></a> +<span class="sourceLineNo">068</span> out.append(',');<a name="line.68"></a> +<span class="sourceLineNo">069</span> append(out, pm.getName());<a name="line.69"></a> +<span class="sourceLineNo">070</span> }<a name="line.70"></a> +<span class="sourceLineNo">071</span> out.append('\n');<a name="line.71"></a> +<span class="sourceLineNo">072</span> for (Object o2 : l) {<a name="line.72"></a> +<span class="sourceLineNo">073</span> i = 0;<a name="line.73"></a> +<span class="sourceLineNo">074</span> BeanMap bean = session.toBeanMap(o2);<a name="line.74"></a> +<span class="sourceLineNo">075</span> for (BeanPropertyMeta pm : bm.getPropertyMetas()) {<a name="line.75"></a> +<span class="sourceLineNo">076</span> if (i++ > 0)<a name="line.76"></a> +<span class="sourceLineNo">077</span> out.append(',');<a name="line.77"></a> +<span class="sourceLineNo">078</span> append(out, pm.get(bean, pm.getName()));<a name="line.78"></a> +<span class="sourceLineNo">079</span> }<a name="line.79"></a> +<span class="sourceLineNo">080</span> out.append('\n');<a name="line.80"></a> +<span class="sourceLineNo">081</span> }<a name="line.81"></a> +<span class="sourceLineNo">082</span> }<a name="line.82"></a> +<span class="sourceLineNo">083</span> }<a name="line.83"></a> +<span class="sourceLineNo">084</span> }<a name="line.84"></a> +<span class="sourceLineNo">085</span><a name="line.85"></a> +<span class="sourceLineNo">086</span> private static void append(Writer w, Object o) throws IOException {<a name="line.86"></a> +<span class="sourceLineNo">087</span> if (o == null)<a name="line.87"></a> +<span class="sourceLineNo">088</span> w.append("null");<a name="line.88"></a> +<span class="sourceLineNo">089</span> else {<a name="line.89"></a> +<span class="sourceLineNo">090</span> String s = o.toString();<a name="line.90"></a> +<span class="sourceLineNo">091</span> boolean mustQuote = false;<a name="line.91"></a> +<span class="sourceLineNo">092</span> for (int i = 0; i < s.length() && ! mustQuote; i++) {<a name="line.92"></a> +<span class="sourceLineNo">093</span> char c = s.charAt(i);<a name="line.93"></a> +<span class="sourceLineNo">094</span> if (Character.isWhitespace(c) || c == ',')<a name="line.94"></a> +<span class="sourceLineNo">095</span> mustQuote = true;<a name="line.95"></a> +<span class="sourceLineNo">096</span> }<a name="line.96"></a> +<span class="sourceLineNo">097</span> if (mustQuote)<a name="line.97"></a> +<span class="sourceLineNo">098</span> w.append('"').append(s).append('"');<a name="line.98"></a> +<span class="sourceLineNo">099</span> else<a name="line.99"></a> +<span class="sourceLineNo">100</span> w.append(s);<a name="line.100"></a> +<span class="sourceLineNo">101</span> }<a name="line.101"></a> +<span class="sourceLineNo">102</span> }<a name="line.102"></a> +<span class="sourceLineNo">103</span>}<a name="line.103"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html index 87117a4..f000217 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParser.html @@ -413,7 +413,7 @@ <span class="sourceLineNo">405</span> ClassMeta<?> cm = bpm.getClassMeta();<a name="line.405"></a> <span class="sourceLineNo">406</span> Object value = parseAnything(session, cm, r, m.getBean(false), false, bpm);<a name="line.406"></a> <span class="sourceLineNo">407</span> setName(cm, value, key);<a name="line.407"></a> -<span class="sourceLineNo">408</span> bpm.set(m, value);<a name="line.408"></a> +<span class="sourceLineNo">408</span> bpm.set(m, key, value);<a name="line.408"></a> <span class="sourceLineNo">409</span> }<a name="line.409"></a> <span class="sourceLineNo">410</span> }<a name="line.410"></a> <span class="sourceLineNo">411</span> l.add(m == null ? null : (E)m.getBean());<a name="line.411"></a> @@ -475,7 +475,7 @@ <span class="sourceLineNo">467</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.467"></a> <span class="sourceLineNo">468</span> Object value = parseAnything(session, cm, r, m.getBean(false), false, pMeta);<a name="line.468"></a> <span class="sourceLineNo">469</span> setName(cm, value, key);<a name="line.469"></a> -<span class="sourceLineNo">470</span> pMeta.set(m, value);<a name="line.470"></a> +<span class="sourceLineNo">470</span> pMeta.set(m, key, value);<a name="line.470"></a> <span class="sourceLineNo">471</span> }<a name="line.471"></a> <span class="sourceLineNo">472</span> }<a name="line.472"></a> <span class="sourceLineNo">473</span> nextTag(r, xTR);<a name="line.473"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/internal/DelegateBeanMap.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/DelegateBeanMap.html b/content/site/apidocs/src-html/org/apache/juneau/internal/DelegateBeanMap.html index 626ca19..39c2f7a 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/internal/DelegateBeanMap.html +++ b/content/site/apidocs/src-html/org/apache/juneau/internal/DelegateBeanMap.html @@ -136,7 +136,7 @@ <span class="sourceLineNo">128</span> Object value;<a name="line.128"></a> <span class="sourceLineNo">129</span><a name="line.129"></a> <span class="sourceLineNo">130</span> private BeanMapEntryOverride(BeanMap<?> bm, BeanPropertyMeta bpm, Object value) {<a name="line.130"></a> -<span class="sourceLineNo">131</span> super(bm, bpm);<a name="line.131"></a> +<span class="sourceLineNo">131</span> super(bm, bpm, bpm.getName());<a name="line.131"></a> <span class="sourceLineNo">132</span> this.value = value;<a name="line.132"></a> <span class="sourceLineNo">133</span> }<a name="line.133"></a> <span class="sourceLineNo">134</span><a name="line.134"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html index 21b3092..5402b81 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.N3.html @@ -239,7 +239,7 @@ <span class="sourceLineNo">231</span> BeanMeta<T> bm = m.getMeta();<a name="line.231"></a> <span class="sourceLineNo">232</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.232"></a> <span class="sourceLineNo">233</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.233"></a> -<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.234"></a> +<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, null, r2.getURI());<a name="line.234"></a> <span class="sourceLineNo">235</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.235"></a> <span class="sourceLineNo">236</span> Statement st = i.next();<a name="line.236"></a> <span class="sourceLineNo">237</span> Property p = st.getPredicate();<a name="line.237"></a> @@ -253,11 +253,11 @@ <span class="sourceLineNo">245</span> ClassMeta<?> et = cm.getElementType();<a name="line.245"></a> <span class="sourceLineNo">246</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.246"></a> <span class="sourceLineNo">247</span> setName(et, value, key);<a name="line.247"></a> -<span class="sourceLineNo">248</span> pMeta.add(m, value);<a name="line.248"></a> +<span class="sourceLineNo">248</span> pMeta.add(m, key, value);<a name="line.248"></a> <span class="sourceLineNo">249</span> } else {<a name="line.249"></a> <span class="sourceLineNo">250</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.250"></a> <span class="sourceLineNo">251</span> setName(cm, value, key);<a name="line.251"></a> -<span class="sourceLineNo">252</span> pMeta.set(m, value);<a name="line.252"></a> +<span class="sourceLineNo">252</span> pMeta.set(m, key, value);<a name="line.252"></a> <span class="sourceLineNo">253</span> }<a name="line.253"></a> <span class="sourceLineNo">254</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.254"></a> <span class="sourceLineNo">255</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.255"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html index 21b3092..5402b81 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.NTriple.html @@ -239,7 +239,7 @@ <span class="sourceLineNo">231</span> BeanMeta<T> bm = m.getMeta();<a name="line.231"></a> <span class="sourceLineNo">232</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.232"></a> <span class="sourceLineNo">233</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.233"></a> -<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.234"></a> +<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, null, r2.getURI());<a name="line.234"></a> <span class="sourceLineNo">235</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.235"></a> <span class="sourceLineNo">236</span> Statement st = i.next();<a name="line.236"></a> <span class="sourceLineNo">237</span> Property p = st.getPredicate();<a name="line.237"></a> @@ -253,11 +253,11 @@ <span class="sourceLineNo">245</span> ClassMeta<?> et = cm.getElementType();<a name="line.245"></a> <span class="sourceLineNo">246</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.246"></a> <span class="sourceLineNo">247</span> setName(et, value, key);<a name="line.247"></a> -<span class="sourceLineNo">248</span> pMeta.add(m, value);<a name="line.248"></a> +<span class="sourceLineNo">248</span> pMeta.add(m, key, value);<a name="line.248"></a> <span class="sourceLineNo">249</span> } else {<a name="line.249"></a> <span class="sourceLineNo">250</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.250"></a> <span class="sourceLineNo">251</span> setName(cm, value, key);<a name="line.251"></a> -<span class="sourceLineNo">252</span> pMeta.set(m, value);<a name="line.252"></a> +<span class="sourceLineNo">252</span> pMeta.set(m, key, value);<a name="line.252"></a> <span class="sourceLineNo">253</span> }<a name="line.253"></a> <span class="sourceLineNo">254</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.254"></a> <span class="sourceLineNo">255</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.255"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html index 21b3092..5402b81 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Turtle.html @@ -239,7 +239,7 @@ <span class="sourceLineNo">231</span> BeanMeta<T> bm = m.getMeta();<a name="line.231"></a> <span class="sourceLineNo">232</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.232"></a> <span class="sourceLineNo">233</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.233"></a> -<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.234"></a> +<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, null, r2.getURI());<a name="line.234"></a> <span class="sourceLineNo">235</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.235"></a> <span class="sourceLineNo">236</span> Statement st = i.next();<a name="line.236"></a> <span class="sourceLineNo">237</span> Property p = st.getPredicate();<a name="line.237"></a> @@ -253,11 +253,11 @@ <span class="sourceLineNo">245</span> ClassMeta<?> et = cm.getElementType();<a name="line.245"></a> <span class="sourceLineNo">246</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.246"></a> <span class="sourceLineNo">247</span> setName(et, value, key);<a name="line.247"></a> -<span class="sourceLineNo">248</span> pMeta.add(m, value);<a name="line.248"></a> +<span class="sourceLineNo">248</span> pMeta.add(m, key, value);<a name="line.248"></a> <span class="sourceLineNo">249</span> } else {<a name="line.249"></a> <span class="sourceLineNo">250</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.250"></a> <span class="sourceLineNo">251</span> setName(cm, value, key);<a name="line.251"></a> -<span class="sourceLineNo">252</span> pMeta.set(m, value);<a name="line.252"></a> +<span class="sourceLineNo">252</span> pMeta.set(m, key, value);<a name="line.252"></a> <span class="sourceLineNo">253</span> }<a name="line.253"></a> <span class="sourceLineNo">254</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.254"></a> <span class="sourceLineNo">255</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.255"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html index 21b3092..5402b81 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.Xml.html @@ -239,7 +239,7 @@ <span class="sourceLineNo">231</span> BeanMeta<T> bm = m.getMeta();<a name="line.231"></a> <span class="sourceLineNo">232</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.232"></a> <span class="sourceLineNo">233</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.233"></a> -<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.234"></a> +<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, null, r2.getURI());<a name="line.234"></a> <span class="sourceLineNo">235</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.235"></a> <span class="sourceLineNo">236</span> Statement st = i.next();<a name="line.236"></a> <span class="sourceLineNo">237</span> Property p = st.getPredicate();<a name="line.237"></a> @@ -253,11 +253,11 @@ <span class="sourceLineNo">245</span> ClassMeta<?> et = cm.getElementType();<a name="line.245"></a> <span class="sourceLineNo">246</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.246"></a> <span class="sourceLineNo">247</span> setName(et, value, key);<a name="line.247"></a> -<span class="sourceLineNo">248</span> pMeta.add(m, value);<a name="line.248"></a> +<span class="sourceLineNo">248</span> pMeta.add(m, key, value);<a name="line.248"></a> <span class="sourceLineNo">249</span> } else {<a name="line.249"></a> <span class="sourceLineNo">250</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.250"></a> <span class="sourceLineNo">251</span> setName(cm, value, key);<a name="line.251"></a> -<span class="sourceLineNo">252</span> pMeta.set(m, value);<a name="line.252"></a> +<span class="sourceLineNo">252</span> pMeta.set(m, key, value);<a name="line.252"></a> <span class="sourceLineNo">253</span> }<a name="line.253"></a> <span class="sourceLineNo">254</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.254"></a> <span class="sourceLineNo">255</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.255"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html index 21b3092..5402b81 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfParser.html @@ -239,7 +239,7 @@ <span class="sourceLineNo">231</span> BeanMeta<T> bm = m.getMeta();<a name="line.231"></a> <span class="sourceLineNo">232</span> RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);<a name="line.232"></a> <span class="sourceLineNo">233</span> if (rbm.hasBeanUri() && r2.getURI() != null)<a name="line.233"></a> -<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, r2.getURI());<a name="line.234"></a> +<span class="sourceLineNo">234</span> rbm.getBeanUriProperty().set(m, null, r2.getURI());<a name="line.234"></a> <span class="sourceLineNo">235</span> for (StmtIterator i = r2.listProperties(); i.hasNext();) {<a name="line.235"></a> <span class="sourceLineNo">236</span> Statement st = i.next();<a name="line.236"></a> <span class="sourceLineNo">237</span> Property p = st.getPredicate();<a name="line.237"></a> @@ -253,11 +253,11 @@ <span class="sourceLineNo">245</span> ClassMeta<?> et = cm.getElementType();<a name="line.245"></a> <span class="sourceLineNo">246</span> Object value = parseAnything(session, et, o, m.getBean(false), pMeta);<a name="line.246"></a> <span class="sourceLineNo">247</span> setName(et, value, key);<a name="line.247"></a> -<span class="sourceLineNo">248</span> pMeta.add(m, value);<a name="line.248"></a> +<span class="sourceLineNo">248</span> pMeta.add(m, key, value);<a name="line.248"></a> <span class="sourceLineNo">249</span> } else {<a name="line.249"></a> <span class="sourceLineNo">250</span> Object value = parseAnything(session, cm, o, m.getBean(false), pMeta);<a name="line.250"></a> <span class="sourceLineNo">251</span> setName(cm, value, key);<a name="line.251"></a> -<span class="sourceLineNo">252</span> pMeta.set(m, value);<a name="line.252"></a> +<span class="sourceLineNo">252</span> pMeta.set(m, key, value);<a name="line.252"></a> <span class="sourceLineNo">253</span> }<a name="line.253"></a> <span class="sourceLineNo">254</span> } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {<a name="line.254"></a> <span class="sourceLineNo">255</span> onUnknownProperty(session, key, m, -1, -1);<a name="line.255"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html index a8f82d2..7699679 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.N3.html @@ -287,7 +287,7 @@ <span class="sourceLineNo">279</span> Object uri = null;<a name="line.279"></a> <span class="sourceLineNo">280</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.280"></a> <span class="sourceLineNo">281</span> if (rbm.hasBeanUri())<a name="line.281"></a> -<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.282"></a> +<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.282"></a> <span class="sourceLineNo">283</span> String uri2 = getUri(session, uri, null);<a name="line.283"></a> <span class="sourceLineNo">284</span> n = m.createResource(uri2);<a name="line.284"></a> <span class="sourceLineNo">285</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.285"></a> @@ -302,7 +302,7 @@ <span class="sourceLineNo">294</span> Object uri = null;<a name="line.294"></a> <span class="sourceLineNo">295</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.295"></a> <span class="sourceLineNo">296</span> if (rbm.hasBeanUri())<a name="line.296"></a> -<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.297"></a> +<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.297"></a> <span class="sourceLineNo">298</span> String uri2 = getUri(session, uri, null);<a name="line.298"></a> <span class="sourceLineNo">299</span> n = m.createResource(uri2);<a name="line.299"></a> <span class="sourceLineNo">300</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.300"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html index a8f82d2..7699679 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.NTriple.html @@ -287,7 +287,7 @@ <span class="sourceLineNo">279</span> Object uri = null;<a name="line.279"></a> <span class="sourceLineNo">280</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.280"></a> <span class="sourceLineNo">281</span> if (rbm.hasBeanUri())<a name="line.281"></a> -<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.282"></a> +<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.282"></a> <span class="sourceLineNo">283</span> String uri2 = getUri(session, uri, null);<a name="line.283"></a> <span class="sourceLineNo">284</span> n = m.createResource(uri2);<a name="line.284"></a> <span class="sourceLineNo">285</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.285"></a> @@ -302,7 +302,7 @@ <span class="sourceLineNo">294</span> Object uri = null;<a name="line.294"></a> <span class="sourceLineNo">295</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.295"></a> <span class="sourceLineNo">296</span> if (rbm.hasBeanUri())<a name="line.296"></a> -<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.297"></a> +<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.297"></a> <span class="sourceLineNo">298</span> String uri2 = getUri(session, uri, null);<a name="line.298"></a> <span class="sourceLineNo">299</span> n = m.createResource(uri2);<a name="line.299"></a> <span class="sourceLineNo">300</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.300"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html index a8f82d2..7699679 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Turtle.html @@ -287,7 +287,7 @@ <span class="sourceLineNo">279</span> Object uri = null;<a name="line.279"></a> <span class="sourceLineNo">280</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.280"></a> <span class="sourceLineNo">281</span> if (rbm.hasBeanUri())<a name="line.281"></a> -<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.282"></a> +<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.282"></a> <span class="sourceLineNo">283</span> String uri2 = getUri(session, uri, null);<a name="line.283"></a> <span class="sourceLineNo">284</span> n = m.createResource(uri2);<a name="line.284"></a> <span class="sourceLineNo">285</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.285"></a> @@ -302,7 +302,7 @@ <span class="sourceLineNo">294</span> Object uri = null;<a name="line.294"></a> <span class="sourceLineNo">295</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.295"></a> <span class="sourceLineNo">296</span> if (rbm.hasBeanUri())<a name="line.296"></a> -<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.297"></a> +<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.297"></a> <span class="sourceLineNo">298</span> String uri2 = getUri(session, uri, null);<a name="line.298"></a> <span class="sourceLineNo">299</span> n = m.createResource(uri2);<a name="line.299"></a> <span class="sourceLineNo">300</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.300"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html index a8f82d2..7699679 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.Xml.html @@ -287,7 +287,7 @@ <span class="sourceLineNo">279</span> Object uri = null;<a name="line.279"></a> <span class="sourceLineNo">280</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.280"></a> <span class="sourceLineNo">281</span> if (rbm.hasBeanUri())<a name="line.281"></a> -<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.282"></a> +<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.282"></a> <span class="sourceLineNo">283</span> String uri2 = getUri(session, uri, null);<a name="line.283"></a> <span class="sourceLineNo">284</span> n = m.createResource(uri2);<a name="line.284"></a> <span class="sourceLineNo">285</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.285"></a> @@ -302,7 +302,7 @@ <span class="sourceLineNo">294</span> Object uri = null;<a name="line.294"></a> <span class="sourceLineNo">295</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.295"></a> <span class="sourceLineNo">296</span> if (rbm.hasBeanUri())<a name="line.296"></a> -<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.297"></a> +<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.297"></a> <span class="sourceLineNo">298</span> String uri2 = getUri(session, uri, null);<a name="line.298"></a> <span class="sourceLineNo">299</span> n = m.createResource(uri2);<a name="line.299"></a> <span class="sourceLineNo">300</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.300"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html index a8f82d2..7699679 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.XmlAbbrev.html @@ -287,7 +287,7 @@ <span class="sourceLineNo">279</span> Object uri = null;<a name="line.279"></a> <span class="sourceLineNo">280</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.280"></a> <span class="sourceLineNo">281</span> if (rbm.hasBeanUri())<a name="line.281"></a> -<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.282"></a> +<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.282"></a> <span class="sourceLineNo">283</span> String uri2 = getUri(session, uri, null);<a name="line.283"></a> <span class="sourceLineNo">284</span> n = m.createResource(uri2);<a name="line.284"></a> <span class="sourceLineNo">285</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.285"></a> @@ -302,7 +302,7 @@ <span class="sourceLineNo">294</span> Object uri = null;<a name="line.294"></a> <span class="sourceLineNo">295</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.295"></a> <span class="sourceLineNo">296</span> if (rbm.hasBeanUri())<a name="line.296"></a> -<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.297"></a> +<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.297"></a> <span class="sourceLineNo">298</span> String uri2 = getUri(session, uri, null);<a name="line.298"></a> <span class="sourceLineNo">299</span> n = m.createResource(uri2);<a name="line.299"></a> <span class="sourceLineNo">300</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.300"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html index a8f82d2..7699679 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jena/RdfSerializer.html @@ -287,7 +287,7 @@ <span class="sourceLineNo">279</span> Object uri = null;<a name="line.279"></a> <span class="sourceLineNo">280</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.280"></a> <span class="sourceLineNo">281</span> if (rbm.hasBeanUri())<a name="line.281"></a> -<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.282"></a> +<span class="sourceLineNo">282</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.282"></a> <span class="sourceLineNo">283</span> String uri2 = getUri(session, uri, null);<a name="line.283"></a> <span class="sourceLineNo">284</span> n = m.createResource(uri2);<a name="line.284"></a> <span class="sourceLineNo">285</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.285"></a> @@ -302,7 +302,7 @@ <span class="sourceLineNo">294</span> Object uri = null;<a name="line.294"></a> <span class="sourceLineNo">295</span> RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class);<a name="line.295"></a> <span class="sourceLineNo">296</span> if (rbm.hasBeanUri())<a name="line.296"></a> -<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm);<a name="line.297"></a> +<span class="sourceLineNo">297</span> uri = rbm.getBeanUriProperty().get(bm, null);<a name="line.297"></a> <span class="sourceLineNo">298</span> String uri2 = getUri(session, uri, null);<a name="line.298"></a> <span class="sourceLineNo">299</span> n = m.createResource(uri2);<a name="line.299"></a> <span class="sourceLineNo">300</span> serializeBeanMap(session, bm, (Resource)n, typeName);<a name="line.300"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html index 6dcc3ff..9dd1c86 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html +++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html @@ -512,7 +512,7 @@ <span class="sourceLineNo">504</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.504"></a> <span class="sourceLineNo">505</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), pMeta);<a name="line.505"></a> <span class="sourceLineNo">506</span> setName(cm, value, currAttr);<a name="line.506"></a> -<span class="sourceLineNo">507</span> pMeta.set(m, value);<a name="line.507"></a> +<span class="sourceLineNo">507</span> pMeta.set(m, currAttr, value);<a name="line.507"></a> <span class="sourceLineNo">508</span> }<a name="line.508"></a> <span class="sourceLineNo">509</span> session.setCurrentProperty(null);<a name="line.509"></a> <span class="sourceLineNo">510</span> }<a name="line.510"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/46c4861b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html index 6dcc3ff..9dd1c86 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html @@ -512,7 +512,7 @@ <span class="sourceLineNo">504</span> ClassMeta<?> cm = pMeta.getClassMeta();<a name="line.504"></a> <span class="sourceLineNo">505</span> Object value = parseAnything(session, cm, r.unread(), m.getBean(false), pMeta);<a name="line.505"></a> <span class="sourceLineNo">506</span> setName(cm, value, currAttr);<a name="line.506"></a> -<span class="sourceLineNo">507</span> pMeta.set(m, value);<a name="line.507"></a> +<span class="sourceLineNo">507</span> pMeta.set(m, currAttr, value);<a name="line.507"></a> <span class="sourceLineNo">508</span> }<a name="line.508"></a> <span class="sourceLineNo">509</span> session.setCurrentProperty(null);<a name="line.509"></a> <span class="sourceLineNo">510</span> }<a name="line.510"></a>
