From 379c3fd79c4846b3453c1ad5195ca9b627176f06 Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Thu, 20 Feb 2014 21:14:34 -0800
Subject: Added support for displaying message on Feed.

Changed MessageThread so that a thread always contains one original
message.

Added support in JsonEncodedProvider for JavaTypes in addition to
classes.

Updated communityfeed.ftl to actually display questions and answers.
---
 src/com/p4square/grow/provider/JsonEncodedProvider.java | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/com/p4square/grow/provider/JsonEncodedProvider.java')

diff --git a/src/com/p4square/grow/provider/JsonEncodedProvider.java b/src/com/p4square/grow/provider/JsonEncodedProvider.java
index 655b531..03e4056 100644
--- a/src/com/p4square/grow/provider/JsonEncodedProvider.java
+++ b/src/com/p4square/grow/provider/JsonEncodedProvider.java
@@ -7,6 +7,7 @@ package com.p4square.grow.provider;
 import java.io.IOException;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
@@ -25,9 +26,16 @@ public abstract class JsonEncodedProvider<K, V> implements Provider<K, V> {
     }
 
     private final Class<V> mClazz;
+    private final JavaType mType;
 
     public JsonEncodedProvider(Class<V> clazz) {
         mClazz = clazz;
+        mType = null;
+    }
+
+    public JsonEncodedProvider(JavaType type) {
+        mType = type;
+        mClazz = null;
     }
 
     /**
@@ -53,7 +61,14 @@ public abstract class JsonEncodedProvider<K, V> implements Provider<K, V> {
             return null;
         }
 
-        V obj = MAPPER.readValue(blob, mClazz);
+        V obj;
+        if (mClazz != null) {
+            obj = MAPPER.readValue(blob, mClazz);
+
+        } else {
+            obj = MAPPER.readValue(blob, mType);
+        }
+
         return obj;
     }
 }
-- 
cgit v1.2.3