GTNPORTAl-2890 Add ability to see "empty" sites in REST API

gatein · Apr 8, 2013 · a1c5798 · a1c5798
1 parent ee252c0
commit a1c5798
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/component/api/src/main/java/org/gatein/api/management/GateInApiManagementResource.java b/component/api/src/main/java/org/gatein/api/management/GateInApiManagementResource.java
@@ -116,8 +116,8 @@ public void after() {
 
     // ------------------------------------------------- Portal Sites --------------------------------------------------//
     @Managed("/sites")
-    public ModelList getSites(@ManagedContext PathAddress address) {
-        return _getSites(SITE_QUERY, address);
+    public ModelList getSites(@ManagedContext PathAddress address, @MappedAttribute("emptySites") String emptySites) {
+        return _getSites(SITE_QUERY, address, emptySites);
     }
 
     @Managed("/sites/{site-name}")
@@ -164,8 +164,8 @@ public NavigationManagementResource getNavigation(@MappedPath("site-name") Strin
 
     // --------------------------------------------- Group Sites (Spaces) ----------------------------------------------//
     @Managed("/spaces")
-    public ModelList getSpaces(@ManagedContext PathAddress address) {
-        return _getSites(SPACE_QUERY, address);
+    public ModelList getSpaces(@ManagedContext PathAddress address, @MappedAttribute("showAll") String showAll) {
+        return _getSites(SPACE_QUERY, address, showAll);
     }
 
     @Managed("/spaces/{group-name: .*}")
@@ -212,8 +212,8 @@ public NavigationManagementResource getSpaceNavigation(@MappedPath("group-name")
 
     // -------------------------------------------- User Sites (Dashboard) ---------------------------------------------//
     @Managed("/dashboards")
-    public ModelList getDashboards(@ManagedContext PathAddress address) {
-        return _getSites(DASHBOARD_QUERY, address);
+    public ModelList getDashboards(@ManagedContext PathAddress address, @MappedAttribute("showAll") String showAll) {
+        return _getSites(DASHBOARD_QUERY, address, showAll);
     }
 
     @Managed("/dashboards/{user-name}")
@@ -273,7 +273,11 @@ private PageManagementResource pagesResource(SiteId siteId, OperationContext con
         return new PageManagementResource(portal, modelProvider, siteId);
     }
 
-    private ModelList _getSites(SiteQuery query, PathAddress address) {
+    private ModelList _getSites(SiteQuery query, PathAddress address, String emptySites) {
+        boolean include = Boolean.valueOf(emptySites);
+        if (include) {
+            query = new SiteQuery.Builder().from(query).includeEmptySites(true).build();
+        }
         List<Site> sites = portal.findSites(query);
         return populateModel(sites, modelProvider.newModel(ModelList.class), address);
     }