You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2014/03/28 11:01:32 UTC
svn commit: r904031 [3/19] - in
/websites/production/turbine/content/fulcrum/fulcrum-json: ./
apidocs/org/apache/fulcrum/json/ apidocs/org/apache/fulcrum/json/gson/
apidocs/org/apache/fulcrum/json/jackson/
apidocs/src-html/org/apache/fulcrum/json/ apid...
Modified: websites/production/turbine/content/fulcrum/fulcrum-json/apidocs/src-html/org/apache/fulcrum/json/jackson/JacksonMapperService.MixinModule.html
==============================================================================
--- websites/production/turbine/content/fulcrum/fulcrum-json/apidocs/src-html/org/apache/fulcrum/json/jackson/JacksonMapperService.MixinModule.html (original)
+++ websites/production/turbine/content/fulcrum/fulcrum-json/apidocs/src-html/org/apache/fulcrum/json/jackson/JacksonMapperService.MixinModule.html Fri Mar 28 10:01:29 2014
@@ -54,428 +54,453 @@
<span class="sourceLineNo">046</span>import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector;<a name="line.46"></a>
<span class="sourceLineNo">047</span>import org.codehaus.jackson.map.module.SimpleModule;<a name="line.47"></a>
<span class="sourceLineNo">048</span>import org.codehaus.jackson.map.ser.FilterProvider;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.codehaus.jackson.map.ser.impl.SimpleBeanPropertyFilter;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.codehaus.jackson.map.ser.impl.SimpleFilterProvider;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>/**<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * Jackson 1 Impl of @link {@link JsonService}.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * <a name="line.54"></a>
-<span class="sourceLineNo">055</span> * By default multiple serialization of the same object in a single thread is<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * not support (e.g filter + mixin or default + filter for the same bean /<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * object).<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * <a name="line.58"></a>
-<span class="sourceLineNo">059</span> * Note: Filters could not easily unregistered. Try setting @link<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * {@link #cacheFilters} to <code>false</code>.<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <a name="line.61"></a>
+<span class="sourceLineNo">049</span>import org.codehaus.jackson.map.ser.StdSerializerProvider;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.codehaus.jackson.map.ser.impl.SimpleBeanPropertyFilter;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.codehaus.jackson.map.ser.impl.SimpleFilterProvider;<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> * Jackson 1 Impl of @link {@link JsonService}.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * <a name="line.55"></a>
+<span class="sourceLineNo">056</span> * By default multiple serialization of the same object in a single thread is<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * not support (e.g filter + mixin or default + filter for the same bean /<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * object).<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <a name="line.59"></a>
+<span class="sourceLineNo">060</span> * Note: Filters could not easily unregistered. Try setting @link<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * {@link #cacheFilters} to <code>false</code>.<a name="line.61"></a>
<span class="sourceLineNo">062</span> * <a name="line.62"></a>
-<span class="sourceLineNo">063</span> * @author gk<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * @version<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * <a name="line.65"></a>
-<span class="sourceLineNo">066</span> */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>public class JacksonMapperService extends AbstractLogEnabled implements<a name="line.67"></a>
-<span class="sourceLineNo">068</span> JsonService, Initializable, Configurable {<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> private static final String DEFAULT_TYPING = "defaultTyping";<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private static final String CACHE_FILTERS = "cacheFilters";<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private static final String DATE_FORMAT = "dateFormat";<a name="line.72"></a>
-<span class="sourceLineNo">073</span> ObjectMapper mapper;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> AnnotationIntrospector primary; // support default<a name="line.74"></a>
-<span class="sourceLineNo">075</span> AnnotationIntrospector secondary;<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> public String ANNOTATIONINSPECTOR = "annotationInspectors";<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> private Hashtable<String, String> annotationInspectors = null;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private Hashtable<String, Boolean> features = null;<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> private Map<String, FilterProvider> filters;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private String dateFormat;<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> final String DEFAULTDATEFORMAT = "MM/dd/yyyy";<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> final boolean defaultType = false;<a name="line.87"></a>
-<span class="sourceLineNo">088</span> public boolean cacheFilters = true; // more efficient if not using multiple<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // serialization in one thread<a name="line.89"></a>
-<span class="sourceLineNo">090</span> String[] defaultTypeDefs = null;<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> @Override<a name="line.92"></a>
-<span class="sourceLineNo">093</span> public synchronized String ser(Object src) throws Exception {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return ser(src, false);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> @Override<a name="line.97"></a>
-<span class="sourceLineNo">098</span> public <T> String ser(Object src, Class<T> type) throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> return ser(src, type, false);<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> public synchronized <T> String ser(Object src, FilterProvider filters)<a name="line.102"></a>
-<span class="sourceLineNo">103</span> throws Exception {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> if (filters == null) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> getLogger().debug("ser class::" + src.getClass() + " without filter "); <a name="line.105"></a>
-<span class="sourceLineNo">106</span> return ser(src);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> } <a name="line.107"></a>
-<span class="sourceLineNo">108</span> getLogger().debug("ser::" + src + " with filters " + filters);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> String serResult = mapper.writer(filters).writeValueAsString(src);<a name="line.109"></a>
-<span class="sourceLineNo">110</span> return serResult;<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> @Override<a name="line.113"></a>
-<span class="sourceLineNo">114</span> public String ser(Object src, Boolean cleanCache) throws Exception {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> if (src.getClass() != null && filters.containsKey(src.getClass().getName())) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> getLogger().warn(<a name="line.116"></a>
-<span class="sourceLineNo">117</span> "Found registered filter - using instead of default view filter for class:"<a name="line.117"></a>
-<span class="sourceLineNo">118</span> + src.getClass().getName());<a name="line.118"></a>
-<span class="sourceLineNo">119</span> // throw new<a name="line.119"></a>
-<span class="sourceLineNo">120</span> // Exception("Found registered filter - could not use custom view and custom filter for class:"+<a name="line.120"></a>
-<span class="sourceLineNo">121</span> // src.getClass().getName());<a name="line.121"></a>
-<span class="sourceLineNo">122</span> }<a name="line.122"></a>
-<span class="sourceLineNo">123</span> return mapper.writer().writeValueAsString(src);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> @Override<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public <T> String ser(Object src, Class<T> type, Boolean cleanCache)<a name="line.127"></a>
-<span class="sourceLineNo">128</span> throws Exception {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> getLogger().debug("ser::" + src + " with type" + type);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if (src.getClass() != null && filters.containsKey(src.getClass().getName())) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> getLogger()<a name="line.131"></a>
-<span class="sourceLineNo">132</span> .warn("Found registered filter - could not use custom view and custom filter for class:"<a name="line.132"></a>
-<span class="sourceLineNo">133</span> + src.getClass().getName());<a name="line.133"></a>
-<span class="sourceLineNo">134</span> // throw new<a name="line.134"></a>
-<span class="sourceLineNo">135</span> // Exception("Found registered filter - could not use custom view and custom filter for class:"+<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // src.getClass().getName());<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span> return mapper.writerWithView(type).writeValueAsString(src);<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> @Override<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public <T> T deSer(String src, Class<T> type) throws Exception {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> ObjectReader reader = mapper.reader(type);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> return reader.readValue(src);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span> <a name="line.146"></a>
-<span class="sourceLineNo">147</span> @Override<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public <T> Collection<T> deSerCollection(String json,<a name="line.148"></a>
-<span class="sourceLineNo">149</span> Object collectionType, Class<T> elementType) throws Exception {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> return mapper.readValue(json, mapper.getTypeFactory()<a name="line.150"></a>
-<span class="sourceLineNo">151</span> .constructCollectionType(((Collection<T>)collectionType).getClass(), elementType));<a name="line.151"></a>
+<span class="sourceLineNo">063</span> * <a name="line.63"></a>
+<span class="sourceLineNo">064</span> * @author gk<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * @version<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * <a name="line.66"></a>
+<span class="sourceLineNo">067</span> */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>public class JacksonMapperService extends AbstractLogEnabled implements<a name="line.68"></a>
+<span class="sourceLineNo">069</span> JsonService, Initializable, Configurable {<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span> private static final String DEFAULT_TYPING = "defaultTyping";<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private static final String CACHE_FILTERS = "cacheFilters";<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private static final String DATE_FORMAT = "dateFormat";<a name="line.73"></a>
+<span class="sourceLineNo">074</span> ObjectMapper mapper;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> AnnotationIntrospector primary; // support default<a name="line.75"></a>
+<span class="sourceLineNo">076</span> AnnotationIntrospector secondary;<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> public String ANNOTATIONINSPECTOR = "annotationInspectors";<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> private Hashtable<String, String> annotationInspectors = null;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private Hashtable<String, Boolean> features = null;<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> private Map<String, FilterProvider> filters;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> private String dateFormat;<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> final String DEFAULTDATEFORMAT = "MM/dd/yyyy";<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> final boolean defaultType = false;<a name="line.88"></a>
+<span class="sourceLineNo">089</span> public boolean cacheFilters = true; // more efficient if not using multiple<a name="line.89"></a>
+<span class="sourceLineNo">090</span> // serialization in one thread<a name="line.90"></a>
+<span class="sourceLineNo">091</span> String[] defaultTypeDefs = null;<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span> public synchronized String ser(Object src) throws Exception {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> return ser(src, false);<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> @Override<a name="line.98"></a>
+<span class="sourceLineNo">099</span> public <T> String ser(Object src, Class<T> type) throws Exception {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> return ser(src, type, false);<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> public synchronized <T> String ser(Object src, FilterProvider filters)<a name="line.103"></a>
+<span class="sourceLineNo">104</span> throws Exception {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> if (filters == null) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> getLogger().debug("ser class::" + src.getClass() + " without filter "); <a name="line.106"></a>
+<span class="sourceLineNo">107</span> return ser(src);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> } <a name="line.108"></a>
+<span class="sourceLineNo">109</span> getLogger().debug("ser::" + src + " with filters " + filters);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> String serResult = mapper.writer(filters).writeValueAsString(src);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> return serResult;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> <a name="line.113"></a>
+<span class="sourceLineNo">114</span> @Override<a name="line.114"></a>
+<span class="sourceLineNo">115</span> public String ser(Object src, Boolean cleanCache) throws Exception {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> if (src.getClass() != null && filters.containsKey(src.getClass().getName())) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> getLogger().warn(<a name="line.117"></a>
+<span class="sourceLineNo">118</span> "Found registered filter - using instead of default view filter for class:"<a name="line.118"></a>
+<span class="sourceLineNo">119</span> + src.getClass().getName());<a name="line.119"></a>
+<span class="sourceLineNo">120</span> // throw new<a name="line.120"></a>
+<span class="sourceLineNo">121</span> // Exception("Found registered filter - could not use custom view and custom filter for class:"+<a name="line.121"></a>
+<span class="sourceLineNo">122</span> // src.getClass().getName());<a name="line.122"></a>
+<span class="sourceLineNo">123</span> }<a name="line.123"></a>
+<span class="sourceLineNo">124</span> if (!cacheFilters || cleanCache) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> cleanSerializerCache();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span> return mapper.writer().writeValueAsString(src);<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> @Override<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public <T> String ser(Object src, Class<T> type, Boolean cleanCache)<a name="line.131"></a>
+<span class="sourceLineNo">132</span> throws Exception {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> getLogger().debug("ser::" + src + " with type" + type);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> if (src.getClass() != null && filters.containsKey(src.getClass().getName())) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> getLogger()<a name="line.135"></a>
+<span class="sourceLineNo">136</span> .warn("Found registered filter - could not use custom view and custom filter for class:"<a name="line.136"></a>
+<span class="sourceLineNo">137</span> + src.getClass().getName());<a name="line.137"></a>
+<span class="sourceLineNo">138</span> // throw new<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // Exception("Found registered filter - could not use custom view and custom filter for class:"+<a name="line.139"></a>
+<span class="sourceLineNo">140</span> // src.getClass().getName());<a name="line.140"></a>
+<span class="sourceLineNo">141</span> }<a name="line.141"></a>
+<span class="sourceLineNo">142</span> if (!cacheFilters || cleanCache) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> cleanSerializerCache();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span> return mapper.writerWithView(type).writeValueAsString(src);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span> @Override<a name="line.148"></a>
+<span class="sourceLineNo">149</span> public <T> T deSer(String src, Class<T> type) throws Exception {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> ObjectReader reader = mapper.reader(type);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> return reader.readValue(src);<a name="line.151"></a>
<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> public <T> T deSer(String json, Class<? extends Collection> collectionType,<a name="line.154"></a>
-<span class="sourceLineNo">155</span> Class<T> type) throws Exception {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return mapper.readValue(json, mapper.getTypeFactory()<a name="line.156"></a>
-<span class="sourceLineNo">157</span> .constructCollectionType(collectionType, type));<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span> public synchronized <T> String serializeAllExceptFilter(Object src,<a name="line.161"></a>
-<span class="sourceLineNo">162</span> Class<T> filterClass, String... filterAttr) throws Exception {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> return serializeAllExceptFilter(src, filterClass, false, filterAttr);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span> <a name="line.165"></a>
-<span class="sourceLineNo">166</span> @Override<a name="line.166"></a>
-<span class="sourceLineNo">167</span> public <T> String serializeAllExceptFilter(Object src,<a name="line.167"></a>
-<span class="sourceLineNo">168</span> Class<T> filterClass, Boolean refreshFilter, String... filterAttr)<a name="line.168"></a>
-<span class="sourceLineNo">169</span> throws Exception {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> setCustomIntrospectorWithExternalFilterId(filterClass);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> FilterProvider filter = null;<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if ( filterClass != null) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> if (filterAttr != null && filterAttr.length > 0 && <a name="line.173"></a>
-<span class="sourceLineNo">174</span> !this.filters.containsKey(filterClass.getName())) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> filter = new SimpleFilterProvider().addFilter(<a name="line.175"></a>
-<span class="sourceLineNo">176</span> filterClass.getName(),<a name="line.176"></a>
-<span class="sourceLineNo">177</span> SimpleBeanPropertyFilter.serializeAllExcept(filterAttr));<a name="line.177"></a>
-<span class="sourceLineNo">178</span> this.filters.put(filterClass.getName(), filter);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> } else {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> filter = this.filters.get(filterClass.getName());<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> String serialized = ser(src, filter);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (!cacheFilters)<a name="line.184"></a>
-<span class="sourceLineNo">185</span> removeFilterClass(filterClass);<a name="line.185"></a>
-<span class="sourceLineNo">186</span> return serialized;<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> @Override<a name="line.189"></a>
-<span class="sourceLineNo">190</span> public synchronized <T> String serializeOnlyFilter(Object src,<a name="line.190"></a>
-<span class="sourceLineNo">191</span> Class<T> filterClass, String... filterAttr) throws Exception {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> return serializeOnlyFilter(src, filterClass, false, filterAttr);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span> <a name="line.194"></a>
-<span class="sourceLineNo">195</span> @Override<a name="line.195"></a>
-<span class="sourceLineNo">196</span> public <T> String serializeOnlyFilter(Object src, Class<T> filterClass,<a name="line.196"></a>
-<span class="sourceLineNo">197</span> Boolean refreshFilter, String... filterAttr) throws Exception {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> setCustomIntrospectorWithExternalFilterId(filterClass);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> FilterProvider filter = null;<a name="line.199"></a>
-<span class="sourceLineNo">200</span> if (filterClass == null && src != null && src.getClass() != null) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> filterClass =(Class<T>) src.getClass();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> if ( filterClass != null) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> if (!this.filters.containsKey(filterClass.getName())) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> getLogger().debug("filterClass::" + filterClass.getName() + " with filterAttr: " + filterAttr);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> if (filterAttr != null) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> filter = new SimpleFilterProvider().addFilter(<a name="line.207"></a>
-<span class="sourceLineNo">208</span> filterClass.getName(),<a name="line.208"></a>
-<span class="sourceLineNo">209</span> SimpleBeanPropertyFilter.filterOutAllExcept(filterAttr));<a name="line.209"></a>
-<span class="sourceLineNo">210</span> this.filters.put(filterClass.getName(), filter);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> } else {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> filter = new SimpleFilterProvider();<a name="line.212"></a>
-<span class="sourceLineNo">213</span> this.filters.put(filterClass.getName(),filter); <a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span> } else {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> filter = this.filters.get(filterClass.getName());<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> String serialized = ser(src, filter);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> getLogger().debug("serialized " + serialized);<a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (!cacheFilters || refreshFilter)<a name="line.221"></a>
-<span class="sourceLineNo">222</span> removeFilterClass(filterClass);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> return serialized;<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> private <T> void removeFilterClass(Class<T> filterClass) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> if (this.filters.containsKey(filterClass.getName())) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> removeCustomIntrospectorWithExternalFilterId(filterClass);<a name="line.228"></a>
-<span class="sourceLineNo">229</span> this.filters.remove(filterClass.getName());<a name="line.229"></a>
-<span class="sourceLineNo">230</span> mapper.getSerializerProvider().flushCachedSerializers();<a name="line.230"></a>
-<span class="sourceLineNo">231</span> getLogger().debug(<a name="line.231"></a>
-<span class="sourceLineNo">232</span> "removed from SimpleFilterProvider filters "<a name="line.232"></a>
-<span class="sourceLineNo">233</span> + filterClass.getName());<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">153</span> <a name="line.153"></a>
+<span class="sourceLineNo">154</span> @Override<a name="line.154"></a>
+<span class="sourceLineNo">155</span> public <T> Collection<T> deSerCollection(String json,<a name="line.155"></a>
+<span class="sourceLineNo">156</span> Object collectionType, Class<T> elementType) throws Exception {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> return mapper.readValue(json, mapper.getTypeFactory()<a name="line.157"></a>
+<span class="sourceLineNo">158</span> .constructCollectionType(((Collection<T>)collectionType).getClass(), elementType));<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> public <T> T deSer(String json, Class<? extends Collection> collectionType,<a name="line.161"></a>
+<span class="sourceLineNo">162</span> Class<T> type) throws Exception {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> return mapper.readValue(json, mapper.getTypeFactory()<a name="line.163"></a>
+<span class="sourceLineNo">164</span> .constructCollectionType(collectionType, type));<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> @Override<a name="line.167"></a>
+<span class="sourceLineNo">168</span> public synchronized <T> String serializeAllExceptFilter(Object src,<a name="line.168"></a>
+<span class="sourceLineNo">169</span> Class<T> filterClass, String... filterAttr) throws Exception {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> return serializeAllExceptFilter(src, filterClass, false, filterAttr);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span> <a name="line.172"></a>
+<span class="sourceLineNo">173</span> @Override<a name="line.173"></a>
+<span class="sourceLineNo">174</span> public <T> String serializeAllExceptFilter(Object src,<a name="line.174"></a>
+<span class="sourceLineNo">175</span> Class<T> filterClass, Boolean refreshFilter, String... filterAttr)<a name="line.175"></a>
+<span class="sourceLineNo">176</span> throws Exception {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> setCustomIntrospectorWithExternalFilterId(filterClass);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> FilterProvider filter = null;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> if ( filterClass != null) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> if (filterAttr != null && filterAttr.length > 0 && <a name="line.180"></a>
+<span class="sourceLineNo">181</span> !this.filters.containsKey(filterClass.getName())) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> filter = new SimpleFilterProvider().addFilter(<a name="line.182"></a>
+<span class="sourceLineNo">183</span> filterClass.getName(),<a name="line.183"></a>
+<span class="sourceLineNo">184</span> SimpleBeanPropertyFilter.serializeAllExcept(filterAttr));<a name="line.184"></a>
+<span class="sourceLineNo">185</span> this.filters.put(filterClass.getName(), filter);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> } else {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> filter = this.filters.get(filterClass.getName());<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> String serialized = ser(src, filter);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (!cacheFilters || refreshFilter) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> removeFilterClass(filterClass);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> cleanSerializerCache();<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> return serialized;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span> @Override<a name="line.198"></a>
+<span class="sourceLineNo">199</span> public synchronized <T> String serializeOnlyFilter(Object src,<a name="line.199"></a>
+<span class="sourceLineNo">200</span> Class<T> filterClass, String... filterAttr) throws Exception {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> return serializeOnlyFilter(src, filterClass, false, filterAttr);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span> <a name="line.203"></a>
+<span class="sourceLineNo">204</span> @Override<a name="line.204"></a>
+<span class="sourceLineNo">205</span> public <T> String serializeOnlyFilter(Object src, Class<T> filterClass,<a name="line.205"></a>
+<span class="sourceLineNo">206</span> Boolean refreshFilter, String... filterAttr) throws Exception {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> setCustomIntrospectorWithExternalFilterId(filterClass);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> FilterProvider filter = null;<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (filterClass == null && src != null && src.getClass() != null) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> filterClass =(Class<T>) src.getClass();<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span> if ( filterClass != null) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> if (!this.filters.containsKey(filterClass.getName())) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> getLogger().debug("filterClass::" + filterClass.getName() + " with filterAttr: " + filterAttr);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> if (filterAttr != null) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> filter = new SimpleFilterProvider().addFilter(<a name="line.216"></a>
+<span class="sourceLineNo">217</span> filterClass.getName(),<a name="line.217"></a>
+<span class="sourceLineNo">218</span> SimpleBeanPropertyFilter.filterOutAllExcept(filterAttr));<a name="line.218"></a>
+<span class="sourceLineNo">219</span> this.filters.put(filterClass.getName(), filter);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> } else {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> filter = new SimpleFilterProvider();<a name="line.221"></a>
+<span class="sourceLineNo">222</span> this.filters.put(filterClass.getName(),filter); <a name="line.222"></a>
+<span class="sourceLineNo">223</span> }<a name="line.223"></a>
+<span class="sourceLineNo">224</span> } else {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> filter = this.filters.get(filterClass.getName());<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> String serialized = ser(src, filter);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> getLogger().debug("serialized " + serialized);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (!cacheFilters || refreshFilter) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> removeFilterClass(filterClass);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> cleanSerializerCache();<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span> return serialized;<a name="line.234"></a>
<span class="sourceLineNo">235</span> }<a name="line.235"></a>
<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> private <T> void setCustomIntrospectorWithExternalFilterId(<a name="line.237"></a>
-<span class="sourceLineNo">238</span> Class<T> externalFilterId) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> if (primary instanceof CustomIntrospector) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> if (externalFilterId != null) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> ((CustomIntrospector) primary)<a name="line.241"></a>
-<span class="sourceLineNo">242</span> .setExternalFilterClasses(externalFilterId);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> getLogger().debug(<a name="line.243"></a>
-<span class="sourceLineNo">244</span> "added class from filters "<a name="line.244"></a>
-<span class="sourceLineNo">245</span> + externalFilterId.getName());<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> private <T> void removeCustomIntrospectorWithExternalFilterId(<a name="line.250"></a>
-<span class="sourceLineNo">251</span> Class<T> externalFilterId) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> if (primary instanceof CustomIntrospector) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> if (externalFilterId != null) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> ((CustomIntrospector) primary)<a name="line.254"></a>
-<span class="sourceLineNo">255</span> .removeExternalFilterClass(externalFilterId);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> getLogger().debug(<a name="line.256"></a>
-<span class="sourceLineNo">257</span> "removed from introspector filter id "<a name="line.257"></a>
-<span class="sourceLineNo">258</span> + externalFilterId.getName());<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> public JacksonMapperService registerModule(Module module) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> mapper.withModule(module);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return this;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> public <T> void addSimpleModule(SimpleModule module, Class<T> type,<a name="line.268"></a>
-<span class="sourceLineNo">269</span> JsonSerializer<T> ser) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> module.addSerializer(type, ser);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> public <T> void addSimpleModule(SimpleModule module, Class<T> type,<a name="line.273"></a>
-<span class="sourceLineNo">274</span> JsonDeserializer<T> deSer) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> module.addDeserializer(type, deSer);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> @Override<a name="line.278"></a>
-<span class="sourceLineNo">279</span> public void setDateFormat(final DateFormat df) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> mapper.setDateFormat(df);<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span> @Override<a name="line.283"></a>
-<span class="sourceLineNo">284</span> public JsonService addAdapter(String name, Class target, Object mixin)<a name="line.284"></a>
-<span class="sourceLineNo">285</span> throws Exception {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> return addAdapter(name, target, mixin.getClass());<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Override<a name="line.289"></a>
-<span class="sourceLineNo">290</span> public JsonService addAdapter(String name, Class target, Class mixin)<a name="line.290"></a>
-<span class="sourceLineNo">291</span> throws Exception {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> Module mx = new MixinModule(name, target, mixin);<a name="line.292"></a>
-<span class="sourceLineNo">293</span> getLogger().debug("registering module " + mx + " for: " + mixin);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> mapper.withModule(mx);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> return this;<a name="line.295"></a>
+<span class="sourceLineNo">237</span> private <T> void removeFilterClass(Class<T> filterClass) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> if (this.filters.containsKey(filterClass.getName())) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> removeCustomIntrospectorWithExternalFilterId(filterClass);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> this.filters.remove(filterClass.getName());<a name="line.240"></a>
+<span class="sourceLineNo">241</span> mapper.getSerializerProvider().flushCachedSerializers();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> getLogger().debug(<a name="line.242"></a>
+<span class="sourceLineNo">243</span> "removed from SimpleFilterProvider filters "<a name="line.243"></a>
+<span class="sourceLineNo">244</span> + filterClass.getName());<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span> <a name="line.247"></a>
+<span class="sourceLineNo">248</span> private void cleanSerializerCache() {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> if (mapper.getSerializerProvider() instanceof StdSerializerProvider) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> int cachedSerProvs = ((StdSerializerProvider) mapper<a name="line.250"></a>
+<span class="sourceLineNo">251</span> .getSerializerProvider()).cachedSerializersCount();<a name="line.251"></a>
+<span class="sourceLineNo">252</span> if (cachedSerProvs > 0) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> getLogger()<a name="line.253"></a>
+<span class="sourceLineNo">254</span> .debug("flushing cachedSerializersCount:"<a name="line.254"></a>
+<span class="sourceLineNo">255</span> + cachedSerProvs);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> ((StdSerializerProvider) mapper.getSerializerProvider())<a name="line.256"></a>
+<span class="sourceLineNo">257</span> .flushCachedSerializers();<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> private <T> void setCustomIntrospectorWithExternalFilterId(<a name="line.262"></a>
+<span class="sourceLineNo">263</span> Class<T> externalFilterId) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (primary instanceof CustomIntrospector) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> if (externalFilterId != null) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> ((CustomIntrospector) primary)<a name="line.266"></a>
+<span class="sourceLineNo">267</span> .setExternalFilterClasses(externalFilterId);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> getLogger().debug(<a name="line.268"></a>
+<span class="sourceLineNo">269</span> "added class from filters "<a name="line.269"></a>
+<span class="sourceLineNo">270</span> + externalFilterId.getName());<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> private <T> void removeCustomIntrospectorWithExternalFilterId(<a name="line.275"></a>
+<span class="sourceLineNo">276</span> Class<T> externalFilterId) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (primary instanceof CustomIntrospector) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> if (externalFilterId != null) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> ((CustomIntrospector) primary)<a name="line.279"></a>
+<span class="sourceLineNo">280</span> .removeExternalFilterClass(externalFilterId);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> getLogger().debug(<a name="line.281"></a>
+<span class="sourceLineNo">282</span> "removed from introspector filter id "<a name="line.282"></a>
+<span class="sourceLineNo">283</span> + externalFilterId.getName());<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> public JacksonMapperService registerModule(Module module) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> mapper.withModule(module);<a name="line.289"></a>
+<span class="sourceLineNo">290</span> return this;<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> public <T> void addSimpleModule(SimpleModule module, Class<T> type,<a name="line.293"></a>
+<span class="sourceLineNo">294</span> JsonSerializer<T> ser) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> module.addSerializer(type, ser);<a name="line.295"></a>
<span class="sourceLineNo">296</span> }<a name="line.296"></a>
<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> /**<a name="line.298"></a>
-<span class="sourceLineNo">299</span> * Avalon component lifecycle method<a name="line.299"></a>
-<span class="sourceLineNo">300</span> */<a name="line.300"></a>
-<span class="sourceLineNo">301</span> @Override<a name="line.301"></a>
-<span class="sourceLineNo">302</span> public void configure(Configuration conf) throws ConfigurationException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> getLogger().debug("conf.getName()" + conf.getName());<a name="line.303"></a>
-<span class="sourceLineNo">304</span> this.annotationInspectors = new Hashtable<String, String>();<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span> final Configuration configuredAnnotationInspectors = conf.getChild(<a name="line.306"></a>
-<span class="sourceLineNo">307</span> ANNOTATIONINSPECTOR, false);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> if (configuredAnnotationInspectors != null) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> Configuration[] nameVal = configuredAnnotationInspectors<a name="line.309"></a>
-<span class="sourceLineNo">310</span> .getChildren();<a name="line.310"></a>
-<span class="sourceLineNo">311</span> for (int i = 0; i < nameVal.length; i++) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> String key = nameVal[i].getName();<a name="line.312"></a>
-<span class="sourceLineNo">313</span> getLogger().debug("configured key: " + key);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> if (key.equals("features")) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> this.features = new Hashtable<String, Boolean>();<a name="line.315"></a>
-<span class="sourceLineNo">316</span> Configuration[] features = nameVal[i].getChildren();<a name="line.316"></a>
-<span class="sourceLineNo">317</span> for (int j = 0; j < features.length; j++) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> boolean featureValue = features[j]<a name="line.318"></a>
-<span class="sourceLineNo">319</span> .getAttributeAsBoolean("value", false);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> String feature = features[j].getValue();<a name="line.320"></a>
-<span class="sourceLineNo">321</span> getLogger().debug(<a name="line.321"></a>
-<span class="sourceLineNo">322</span> "configuredAnnotationInspectors " + feature<a name="line.322"></a>
-<span class="sourceLineNo">323</span> + ":" + featureValue);<a name="line.323"></a>
-<span class="sourceLineNo">324</span> this.features.put(feature, featureValue);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } else {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> String val = nameVal[i].getValue();<a name="line.327"></a>
-<span class="sourceLineNo">328</span> getLogger()<a name="line.328"></a>
-<span class="sourceLineNo">329</span> .debug("configuredAnnotationInspectors " + key<a name="line.329"></a>
-<span class="sourceLineNo">330</span> + ":" + val);<a name="line.330"></a>
-<span class="sourceLineNo">331</span> this.annotationInspectors.put(key, val);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> }<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> final Configuration configuredDateFormat = conf.getChild(DATE_FORMAT,<a name="line.335"></a>
-<span class="sourceLineNo">336</span> true);<a name="line.336"></a>
-<span class="sourceLineNo">337</span> this.dateFormat = configuredDateFormat.getValue(DEFAULTDATEFORMAT);<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> final Configuration configuredKeepFilter = conf.getChild(CACHE_FILTERS,<a name="line.339"></a>
-<span class="sourceLineNo">340</span> false);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (configuredKeepFilter != null) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> this.cacheFilters = configuredKeepFilter.getValueAsBoolean();<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span> final Configuration configuredDefaultType = conf.getChild(<a name="line.344"></a>
-<span class="sourceLineNo">345</span> DEFAULT_TYPING, false);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (configuredDefaultType != null) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> defaultTypeDefs = new String[] {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> configuredDefaultType.getAttribute("type"),<a name="line.348"></a>
-<span class="sourceLineNo">349</span> configuredDefaultType.getAttribute("key") };<a name="line.349"></a>
-<span class="sourceLineNo">350</span> }<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> @Override<a name="line.353"></a>
-<span class="sourceLineNo">354</span> public void initialize() throws Exception {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> mapper = new ObjectMapper();<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> Enumeration<String> enumKey = annotationInspectors.keys();<a name="line.357"></a>
-<span class="sourceLineNo">358</span> while (enumKey.hasMoreElements()) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> String key = enumKey.nextElement();<a name="line.359"></a>
-<span class="sourceLineNo">360</span> String avClass = annotationInspectors.get(key);<a name="line.360"></a>
-<span class="sourceLineNo">361</span> if (key.equals("primary") && avClass != null) {<a name="line.361"></a>
-<span class="sourceLineNo">362</span> try {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> primary = (AnnotationIntrospector) Class.forName(avClass)<a name="line.363"></a>
-<span class="sourceLineNo">364</span> .newInstance();<a name="line.364"></a>
-<span class="sourceLineNo">365</span> } catch (Exception e) {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> throw new Exception(<a name="line.366"></a>
-<span class="sourceLineNo">367</span> "JsonMapperService: Error instantiating " + avClass<a name="line.367"></a>
-<span class="sourceLineNo">368</span> + " for " + key);<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> } else if (key.equals("secondary") && avClass != null) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span> try {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> secondary = (AnnotationIntrospector) Class.forName(avClass)<a name="line.372"></a>
-<span class="sourceLineNo">373</span> .newInstance();<a name="line.373"></a>
-<span class="sourceLineNo">374</span> } catch (Exception e) {<a name="line.374"></a>
-<span class="sourceLineNo">375</span> throw new Exception(<a name="line.375"></a>
-<span class="sourceLineNo">376</span> "JsonMapperService: Error instantiating " + avClass<a name="line.376"></a>
-<span class="sourceLineNo">377</span> + " for " + key);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (primary == null) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> primary = new JacksonAnnotationIntrospector(); // support default<a name="line.382"></a>
-<span class="sourceLineNo">383</span> getLogger().info(<a name="line.383"></a>
-<span class="sourceLineNo">384</span> "using default introspector:"<a name="line.384"></a>
-<span class="sourceLineNo">385</span> + primary.getClass().getName());<a name="line.385"></a>
-<span class="sourceLineNo">386</span> mapper.setAnnotationIntrospector(primary);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> } else {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> AnnotationIntrospector pair = new AnnotationIntrospector.Pair(<a name="line.388"></a>
-<span class="sourceLineNo">389</span> primary, secondary);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> mapper.setAnnotationIntrospector(pair);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> // mapper.enableDefaultTypingAsProperty(DefaultTyping.OBJECT_AND_NON_CONCRETE,<a name="line.393"></a>
-<span class="sourceLineNo">394</span> // "type");<a name="line.394"></a>
-<span class="sourceLineNo">395</span> if (features != null) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> Enumeration<String> enumFeatureKey = features.keys();<a name="line.396"></a>
-<span class="sourceLineNo">397</span> while (enumFeatureKey.hasMoreElements()) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> String featureKey = enumFeatureKey.nextElement();<a name="line.398"></a>
-<span class="sourceLineNo">399</span> Boolean featureValue = features.get(featureKey);<a name="line.399"></a>
-<span class="sourceLineNo">400</span> Feature feature;<a name="line.400"></a>
-<span class="sourceLineNo">401</span> if (featureKey != null && featureValue != null) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> try {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> String[] featureParts = featureKey.split("\\.");<a name="line.403"></a>
-<span class="sourceLineNo">404</span> getLogger().info(<a name="line.404"></a>
-<span class="sourceLineNo">405</span> "initializing mapper feature: "<a name="line.405"></a>
-<span class="sourceLineNo">406</span> + featureParts[featureParts.length - 1]<a name="line.406"></a>
-<span class="sourceLineNo">407</span> + " with " + featureValue);<a name="line.407"></a>
-<span class="sourceLineNo">408</span> feature = Feature<a name="line.408"></a>
-<span class="sourceLineNo">409</span> .valueOf(featureParts[featureParts.length - 1]);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> mapper.configure(feature, featureValue);<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span> assert mapper.getSerializationConfig().isEnabled(<a name="line.412"></a>
-<span class="sourceLineNo">413</span> feature) == featureValue;<a name="line.413"></a>
-<span class="sourceLineNo">414</span> } catch (Exception e) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> throw new Exception(<a name="line.415"></a>
-<span class="sourceLineNo">416</span> "JsonMapperService: Error instantiating feature "<a name="line.416"></a>
-<span class="sourceLineNo">417</span> + featureKey + " with " + featureValue,<a name="line.417"></a>
-<span class="sourceLineNo">418</span> e);<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> }<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span> if (defaultTypeDefs != null && defaultTypeDefs.length == 2) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> DefaultTyping defaultTyping = DefaultTyping<a name="line.425"></a>
-<span class="sourceLineNo">426</span> .valueOf(defaultTypeDefs[0]);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> mapper.enableDefaultTypingAsProperty(defaultTyping,<a name="line.427"></a>
-<span class="sourceLineNo">428</span> defaultTypeDefs[1]);<a name="line.428"></a>
-<span class="sourceLineNo">429</span> getLogger().info(<a name="line.429"></a>
-<span class="sourceLineNo">430</span> "default typing is " + defaultTypeDefs[0] + " with key:"<a name="line.430"></a>
-<span class="sourceLineNo">431</span> + defaultTypeDefs[1]);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> }<a name="line.432"></a>
-<span class="sourceLineNo">433</span><a name="line.433"></a>
-<span class="sourceLineNo">434</span> getLogger().info("setting date format to:" + dateFormat);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> getLogger().info("keepFilters is:" + cacheFilters);<a name="line.435"></a>
+<span class="sourceLineNo">298</span> public <T> void addSimpleModule(SimpleModule module, Class<T> type,<a name="line.298"></a>
+<span class="sourceLineNo">299</span> JsonDeserializer<T> deSer) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> module.addDeserializer(type, deSer);<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span><a name="line.302"></a>
+<span class="sourceLineNo">303</span> @Override<a name="line.303"></a>
+<span class="sourceLineNo">304</span> public void setDateFormat(final DateFormat df) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> mapper.setDateFormat(df);<a name="line.305"></a>
+<span class="sourceLineNo">306</span> }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public JsonService addAdapter(String name, Class target, Object mixin)<a name="line.309"></a>
+<span class="sourceLineNo">310</span> throws Exception {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> return addAdapter(name, target, mixin.getClass());<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span> @Override<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public JsonService addAdapter(String name, Class target, Class mixin)<a name="line.315"></a>
+<span class="sourceLineNo">316</span> throws Exception {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> Module mx = new MixinModule(name, target, mixin);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> getLogger().debug("registering module " + mx + " for: " + mixin);<a name="line.318"></a>
+<span class="sourceLineNo">319</span> mapper.withModule(mx);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> return this;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> /**<a name="line.323"></a>
+<span class="sourceLineNo">324</span> * Avalon component lifecycle method<a name="line.324"></a>
+<span class="sourceLineNo">325</span> */<a name="line.325"></a>
+<span class="sourceLineNo">326</span> @Override<a name="line.326"></a>
+<span class="sourceLineNo">327</span> public void configure(Configuration conf) throws ConfigurationException {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> getLogger().debug("conf.getName()" + conf.getName());<a name="line.328"></a>
+<span class="sourceLineNo">329</span> this.annotationInspectors = new Hashtable<String, String>();<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> final Configuration configuredAnnotationInspectors = conf.getChild(<a name="line.331"></a>
+<span class="sourceLineNo">332</span> ANNOTATIONINSPECTOR, false);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> if (configuredAnnotationInspectors != null) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> Configuration[] nameVal = configuredAnnotationInspectors<a name="line.334"></a>
+<span class="sourceLineNo">335</span> .getChildren();<a name="line.335"></a>
+<span class="sourceLineNo">336</span> for (int i = 0; i < nameVal.length; i++) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> String key = nameVal[i].getName();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> getLogger().debug("configured key: " + key);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> if (key.equals("features")) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> this.features = new Hashtable<String, Boolean>();<a name="line.340"></a>
+<span class="sourceLineNo">341</span> Configuration[] features = nameVal[i].getChildren();<a name="line.341"></a>
+<span class="sourceLineNo">342</span> for (int j = 0; j < features.length; j++) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> boolean featureValue = features[j]<a name="line.343"></a>
+<span class="sourceLineNo">344</span> .getAttributeAsBoolean("value", false);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> String feature = features[j].getValue();<a name="line.345"></a>
+<span class="sourceLineNo">346</span> getLogger().debug(<a name="line.346"></a>
+<span class="sourceLineNo">347</span> "configuredAnnotationInspectors " + feature<a name="line.347"></a>
+<span class="sourceLineNo">348</span> + ":" + featureValue);<a name="line.348"></a>
+<span class="sourceLineNo">349</span> this.features.put(feature, featureValue);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span> } else {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> String val = nameVal[i].getValue();<a name="line.352"></a>
+<span class="sourceLineNo">353</span> getLogger()<a name="line.353"></a>
+<span class="sourceLineNo">354</span> .debug("configuredAnnotationInspectors " + key<a name="line.354"></a>
+<span class="sourceLineNo">355</span> + ":" + val);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> this.annotationInspectors.put(key, val);<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> final Configuration configuredDateFormat = conf.getChild(DATE_FORMAT,<a name="line.360"></a>
+<span class="sourceLineNo">361</span> true);<a name="line.361"></a>
+<span class="sourceLineNo">362</span> this.dateFormat = configuredDateFormat.getValue(DEFAULTDATEFORMAT);<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span> final Configuration configuredKeepFilter = conf.getChild(CACHE_FILTERS,<a name="line.364"></a>
+<span class="sourceLineNo">365</span> false);<a name="line.365"></a>
+<span class="sourceLineNo">366</span> if (configuredKeepFilter != null) {<a name="line.366"></a>
+<span class="sourceLineNo">367</span> this.cacheFilters = configuredKeepFilter.getValueAsBoolean();<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<a name="line.368"></a>
+<span class="sourceLineNo">369</span> final Configuration configuredDefaultType = conf.getChild(<a name="line.369"></a>
+<span class="sourceLineNo">370</span> DEFAULT_TYPING, false);<a name="line.370"></a>
+<span class="sourceLineNo">371</span> if (configuredDefaultType != null) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> defaultTypeDefs = new String[] {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> configuredDefaultType.getAttribute("type"),<a name="line.373"></a>
+<span class="sourceLineNo">374</span> configuredDefaultType.getAttribute("key") };<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span> }<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span> @Override<a name="line.378"></a>
+<span class="sourceLineNo">379</span> public void initialize() throws Exception {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> mapper = new ObjectMapper();<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> Enumeration<String> enumKey = annotationInspectors.keys();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> while (enumKey.hasMoreElements()) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> String key = enumKey.nextElement();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> String avClass = annotationInspectors.get(key);<a name="line.385"></a>
+<span class="sourceLineNo">386</span> if (key.equals("primary") && avClass != null) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> try {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> primary = (AnnotationIntrospector) Class.forName(avClass)<a name="line.388"></a>
+<span class="sourceLineNo">389</span> .newInstance();<a name="line.389"></a>
+<span class="sourceLineNo">390</span> } catch (Exception e) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> throw new Exception(<a name="line.391"></a>
+<span class="sourceLineNo">392</span> "JsonMapperService: Error instantiating " + avClass<a name="line.392"></a>
+<span class="sourceLineNo">393</span> + " for " + key);<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span> } else if (key.equals("secondary") && avClass != null) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> try {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> secondary = (AnnotationIntrospector) Class.forName(avClass)<a name="line.397"></a>
+<span class="sourceLineNo">398</span> .newInstance();<a name="line.398"></a>
+<span class="sourceLineNo">399</span> } catch (Exception e) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> throw new Exception(<a name="line.400"></a>
+<span class="sourceLineNo">401</span> "JsonMapperService: Error instantiating " + avClass<a name="line.401"></a>
+<span class="sourceLineNo">402</span> + " for " + key);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> }<a name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if (primary == null) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> primary = new JacksonAnnotationIntrospector(); // support default<a name="line.407"></a>
+<span class="sourceLineNo">408</span> getLogger().info(<a name="line.408"></a>
+<span class="sourceLineNo">409</span> "using default introspector:"<a name="line.409"></a>
+<span class="sourceLineNo">410</span> + primary.getClass().getName());<a name="line.410"></a>
+<span class="sourceLineNo">411</span> mapper.setAnnotationIntrospector(primary);<a name="line.411"></a>
+<span class="sourceLineNo">412</span> } else {<a name="line.412"></a>
+<span class="sourceLineNo">413</span> AnnotationIntrospector pair = new AnnotationIntrospector.Pair(<a name="line.413"></a>
+<span class="sourceLineNo">414</span> primary, secondary);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> mapper.setAnnotationIntrospector(pair);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span> // mapper.enableDefaultTypingAsProperty(DefaultTyping.OBJECT_AND_NON_CONCRETE,<a name="line.418"></a>
+<span class="sourceLineNo">419</span> // "type");<a name="line.419"></a>
+<span class="sourceLineNo">420</span> if (features != null) {<a name="line.420"></a>
+<span class="sourceLineNo">421</span> Enumeration<String> enumFeatureKey = features.keys();<a name="line.421"></a>
+<span class="sourceLineNo">422</span> while (enumFeatureKey.hasMoreElements()) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> String featureKey = enumFeatureKey.nextElement();<a name="line.423"></a>
+<span class="sourceLineNo">424</span> Boolean featureValue = features.get(featureKey);<a name="line.424"></a>
+<span class="sourceLineNo">425</span> Feature feature;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (featureKey != null && featureValue != null) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> try {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> String[] featureParts = featureKey.split("\\.");<a name="line.428"></a>
+<span class="sourceLineNo">429</span> getLogger().info(<a name="line.429"></a>
+<span class="sourceLineNo">430</span> "initializing mapper feature: "<a name="line.430"></a>
+<span class="sourceLineNo">431</span> + featureParts[featureParts.length - 1]<a name="line.431"></a>
+<span class="sourceLineNo">432</span> + " with " + featureValue);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> feature = Feature<a name="line.433"></a>
+<span class="sourceLineNo">434</span> .valueOf(featureParts[featureParts.length - 1]);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> mapper.configure(feature, featureValue);<a name="line.435"></a>
<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span> mapper.setDateFormat(new SimpleDateFormat(dateFormat));<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> filters = Collections<a name="line.439"></a>
-<span class="sourceLineNo">440</span> .synchronizedMap(new HashMap<String, FilterProvider>());<a name="line.440"></a>
-<span class="sourceLineNo">441</span> getLogger().info("initialized: mapper:" + mapper);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> public ObjectMapper getMapper() {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> return mapper;<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> public void setMapper(ObjectMapper mapper) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> this.mapper = mapper;<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span> public static class MixinModule extends SimpleModule {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> public final Class<?> clazz;<a name="line.453"></a>
-<span class="sourceLineNo">454</span> public final Class<?> mixin;<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> public <T, U> MixinModule(String name, Class<T> clazz, Class<U> mixin) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span> super(name, new Version(1, 0, 0, null));<a name="line.457"></a>
-<span class="sourceLineNo">458</span> this.clazz = clazz;<a name="line.458"></a>
-<span class="sourceLineNo">459</span> this.mixin = mixin;<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> @Override<a name="line.463"></a>
-<span class="sourceLineNo">464</span> public void setupModule(SetupContext context) {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> context.setMixInAnnotations(this.clazz, this.mixin);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">437</span> assert mapper.getSerializationConfig().isEnabled(<a name="line.437"></a>
+<span class="sourceLineNo">438</span> feature) == featureValue;<a name="line.438"></a>
+<span class="sourceLineNo">439</span> } catch (Exception e) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> throw new Exception(<a name="line.440"></a>
+<span class="sourceLineNo">441</span> "JsonMapperService: Error instantiating feature "<a name="line.441"></a>
+<span class="sourceLineNo">442</span> + featureKey + " with " + featureValue,<a name="line.442"></a>
+<span class="sourceLineNo">443</span> e);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> }<a name="line.444"></a>
+<span class="sourceLineNo">445</span> }<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> if (defaultTypeDefs != null && defaultTypeDefs.length == 2) {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> DefaultTyping defaultTyping = DefaultTyping<a name="line.450"></a>
+<span class="sourceLineNo">451</span> .valueOf(defaultTypeDefs[0]);<a name="line.451"></a>
+<span class="sourceLineNo">452</span> mapper.enableDefaultTypingAsProperty(defaultTyping,<a name="line.452"></a>
+<span class="sourceLineNo">453</span> defaultTypeDefs[1]);<a name="line.453"></a>
+<span class="sourceLineNo">454</span> getLogger().info(<a name="line.454"></a>
+<span class="sourceLineNo">455</span> "default typing is " + defaultTypeDefs[0] + " with key:"<a name="line.455"></a>
+<span class="sourceLineNo">456</span> + defaultTypeDefs[1]);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span><a name="line.458"></a>
+<span class="sourceLineNo">459</span> getLogger().info("setting date format to:" + dateFormat);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> getLogger().info("keepFilters is:" + cacheFilters);<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span> mapper.setDateFormat(new SimpleDateFormat(dateFormat));<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> filters = Collections<a name="line.464"></a>
+<span class="sourceLineNo">465</span> .synchronizedMap(new HashMap<String, FilterProvider>());<a name="line.465"></a>
+<span class="sourceLineNo">466</span> getLogger().info("initialized: mapper:" + mapper);<a name="line.466"></a>
<span class="sourceLineNo">467</span> }<a name="line.467"></a>
<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span>}<a name="line.470"></a>
+<span class="sourceLineNo">469</span> public ObjectMapper getMapper() {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> return mapper;<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> public void setMapper(ObjectMapper mapper) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span> this.mapper = mapper;<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span> public static class MixinModule extends SimpleModule {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> public final Class<?> clazz;<a name="line.478"></a>
+<span class="sourceLineNo">479</span> public final Class<?> mixin;<a name="line.479"></a>
+<span class="sourceLineNo">480</span><a name="line.480"></a>
+<span class="sourceLineNo">481</span> public <T, U> MixinModule(String name, Class<T> clazz, Class<U> mixin) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> super(name, new Version(1, 0, 0, null));<a name="line.482"></a>
+<span class="sourceLineNo">483</span> this.clazz = clazz;<a name="line.483"></a>
+<span class="sourceLineNo">484</span> this.mixin = mixin;<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> @Override<a name="line.488"></a>
+<span class="sourceLineNo">489</span> public void setupModule(SetupContext context) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> context.setMixInAnnotations(this.clazz, this.mixin);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> }<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span>}<a name="line.495"></a>