From 94db43b6bd4f3de77135210889f34e91fc09da9e Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 17 Sep 2012 08:53:33 +0000
Subject: [PATCH] * Marked the "site" and "unloadedonly" parameters on the GET
 DataSet URI as optional * Fixed the code for the getting the data set if a
 site name is not provided

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@41645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/rma/datasets.get.desc.xml         |  2 +-
 .../org_alfresco_module_rm/script/DataSetsGet.java | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.desc.xml b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.desc.xml
index b0161ba6c0..9cdf5dfc6c 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.desc.xml
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
    <shortname>Get data sets</shortname>
    <description>WebScript to get the list of available RM test data</description>
-   <url>/api/rma/datasets?site={site}&amp;unloadedonly={unloadedonly}</url>
+   <url>/api/rma/datasets?site={site?}&amp;unloadedonly={unloadedonly?}</url>
    <format default="json">argument</format>
    <authentication>admin</authentication>
    <transaction>required</transaction>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
index 537cc5452a..1a02306cc7 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
@@ -19,6 +19,12 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
 public class DataSetsGet extends DeclarativeWebScript
 {
 
+   /** Constant for the site name parameter */
+   private static final String ARG_SITE_NAME = "site";
+
+   /** Constant for the unloadedonly parameter */
+   private static final String ARG_UNLOADED_ONLY = "unloadedonly";
+
    /** Data set service */
    private DataSetService dataSetService;
 
@@ -54,11 +60,15 @@ public class DataSetsGet extends DeclarativeWebScript
    protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
    {
       // Get the site name from the URL and find out the file plan
-      String siteName = req.getParameter("site");
+      String siteName = req.getParameter(ARG_SITE_NAME);
+      if (StringUtils.isBlank(siteName))
+      {
+         siteName = RmSiteType.DEFAULT_SITE_NAME;
+      }
       NodeRef filePlan = siteService.getContainer(siteName, RmSiteType.COMPONENT_DOCUMENT_LIBRARY);
 
       // Check if only unloaded data sets should be returned - default value is false
-      String unloadedOnlyParam = req.getParameter("unloadedonly");
+      String unloadedOnlyParam = req.getParameter(ARG_UNLOADED_ONLY);
       boolean unloadedOnly = false;
       if (StringUtils.isNotBlank(unloadedOnlyParam))
       {