[Amdatu-commits] SVN r2189 - in trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement: bean/dashboard bean/gadget rest

[subversion]

Author: ivo...@gmail.com
Date: Fri Apr  6 09:49:01 2012
New Revision: 2189

Log:
[AMDATUOPENSOCIAL-204] Reverted the gadget store REST API, finalizing this API 
is postponed to a next version.

Modified:
   
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Definition.java
   
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Gadget.java
   
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/gadget/
   
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/CategoriesRESTServiceImpl.java
   
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/GadgetRESTServiceImpl.java

Modified: 
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Definition.java
==============================================================================
--- 
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Definition.java
     (original)
+++ 
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Definition.java
     Fri Apr  6 09:49:01 2012
@@ -16,8 +16,6 @@
 package org.amdatu.opensocial.gadgetmanagement.bean.dashboard;
 
 import org.amdatu.opensocial.gadgetmanagement.UserPreferenceBean;
-import org.amdatu.opensocial.gadgetmanagement.bean.gadget.Category;
-import org.amdatu.opensocial.rest.tools.LinkResource;
 import org.amdatu.opensocial.rest.tools.RESTInvocationContext;
 import org.amdatu.opensocial.rest.tools.ReferenceableResource;
 
@@ -27,8 +25,6 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.gson.annotations.SerializedName;
 /**
  * The bean represents the gadget definition.
  * 
@@ -42,9 +38,6 @@
     private Metadata m_metadata;
     private List<UserPreferenceBean> m_userPreferences;
 
-    @SerializedName("category")
-    private List<Category> m_categories;
-
     public String getId() {
         return m_id;
     }
@@ -85,44 +78,21 @@
         }
         m_userPreferences.add(userPreference);
     }
-
-    @XmlElementWrapper(name = "categories")
-    @XmlElement(name = "category")
-    @LinkResource(value = Category.class)
-    public List<Category> getCategories() {
-        return m_categories;
-    }
-
-    public void setCategories(List<Category> categories) {
-        m_categories = categories;
-    }
-
-    public void addCategory(Category category) {
-        if (m_categories == null) {
-            m_categories = new ArrayList<Category>();
-        }
-        m_categories.add(category);
-    }
     
     public static Definition getExampleWithMetadata(RESTInvocationContext 
context) {
-        return getExample(context, true, false);
+        return getExample(context, true);
     }
     
     public static Definition getExample(RESTInvocationContext context) {
-        return getExample(context, false, false);
+        return getExample(context, false);
     }
 
-    public static Definition getExample(RESTInvocationContext context, boolean 
expandSpec, boolean addCat) {
+    public static Definition getExample(RESTInvocationContext context, boolean 
expandSpec) {
         Definition definition = new Definition();
         definition.setId("749021");
         definition.addLink("http://localhost/rest/gadgets/749021";, "self", 
context.getMimeType());
         definition.setUrl("http://gadgets.nu.nl/nuzakelijk_igoogle.xml";);
 
-        if (addCat) {
-            Category cat = Category.getExample(context, false);
-            definition.addCategory(cat);
-        }
-
         if (expandSpec) {
             Metadata metadata = new Metadata();
             metadata.setHeight("300");

Modified: 
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Gadget.java
==============================================================================
--- 
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Gadget.java
 (original)
+++ 
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/bean/dashboard/Gadget.java
 Fri Apr  6 09:49:01 2012
@@ -76,7 +76,7 @@
     public static Gadget getExample(RESTInvocationContext context, boolean 
expandSpec) {
         Gadget gadget = new Gadget();
         gadget.setId("gadget1");
-        gadget.setDefinition(Definition.getExample(context, expandSpec, 
false));
+        gadget.setDefinition(Definition.getExample(context, expandSpec));
         gadget.setState(State.getExampleInstance());
         if (!context.isInput()) {
             gadget.setUserPreferences(UserPreferencesBean.getInputExample());
_______________________________________________
Amdatu-commits mailing list
Amdatu-commits@amdatu.org
http://lists.amdatu.org/mailman/listinfo/amdatu-commits