svn commit: r1514809 - /rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java

[erinnp]

Author: erinnp
Date: Fri Aug 16 17:31:47 2013
New Revision: 1514809

URL: http://svn.apache.org/r1514809
Log:
Properly serialize metadata string for pagesForRender endpoint

Modified:
    
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java

Modified: 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java?rev=1514809&r1=1514808&r2=1514809&view=diff
==============================================================================
--- 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
 (original)
+++ 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
 Fri Aug 16 17:31:47 2013
@@ -19,23 +19,28 @@
 
 package org.apache.rave.provider.opensocial.web.model;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.rave.rest.model.RegionWidget;
 
 import javax.xml.bind.annotation.*;
+import java.util.Map;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class OpenSocialRegionWidget extends RegionWidget {
-    @XmlElement(name="securityToken")
+    @XmlElement(name = "securityToken")
     protected String securityToken;
-    @XmlElement(name="metadata")
-    protected String metadata;
+    @XmlElement(name = "metadata")
+    protected Map<String, Object> metadata;
 
-    public OpenSocialRegionWidget() {  }
+    private static ObjectMapper mapper = new ObjectMapper();
+
+    public OpenSocialRegionWidget() {
+    }
 
     public OpenSocialRegionWidget(RegionWidget base, String securityToken, 
String metadata) {
         this(base);
         this.securityToken = securityToken;
-        this.metadata = metadata;
+        setMetadata(metadata);
     }
 
     public OpenSocialRegionWidget(RegionWidget base) {
@@ -59,11 +64,17 @@ public class OpenSocialRegionWidget exte
         this.securityToken = securityToken;
     }
 
-    public String getMetadata() {
+    public  Map<String, Object> getMetadata() {
         return metadata;
     }
 
     public void setMetadata(String metadata) {
-        this.metadata = metadata;
+        Map<String, Object> metadataObject = null;
+        try {
+            metadataObject = mapper.readValue(metadata, Map.class);
+        } catch (Exception e) {
+            //TODO: Do we need to handle this exception somehow?
+        }
+        this.metadata = metadataObject;
     }
 }