JIRA-74: Handle the possibility to pass a JQL instead of a filter ID in BiDimensionalGridChart

  * Support JQL query using filterID=jql-<query> format in REST API.

Author: surli

jira-macro/jira-macro-charts/src/main/java/org/xwiki/contrib/jira/charts/internal/AbstractJIRAChartDataFetcher.java

@@ -66,7 +66,7 @@ public U fetch(T parameters, Class<U> expectedType) throws MacroExecutionExcepti
         if (!StringUtils.isEmpty(parameters.getFilterId())) {
             parametersList.add(handleFilterIdParameter(parameters.getFilterId()));
         } else {
-            parametersList.add(new BasicNameValuePair("jql", parameters.getQuery()));
+            parametersList.add(handleQueryParameter(parameters.getQuery()));
         }
         parametersList.addAll(getCustomQueryParameters(parameters));
 
@@ -110,6 +110,16 @@ public NameValuePair handleFilterIdParameter(String filterIdValue)
         return new BasicNameValuePair("filterId", computeFilterIdFormat(filterIdValue, false));
     }
 
+    /**
+     * Define how to handle the query parameter.
+     * @param queryValue the value given by the user
+     * @return the {@link NameValuePair} used to perform the REST call.
+     */
+    public NameValuePair handleQueryParameter(String queryValue)
+    {
+        return new BasicNameValuePair("jql", queryValue);
+    }
+
     /**
      * @return the type of requested gadget.
      */

jira-macro/jira-macro-charts/src/main/java/org/xwiki/contrib/jira/charts/internal/bidimensionalgrid/JIRABiDimensionalGridChartDataFetcher.java

@@ -44,6 +44,8 @@ public class JIRABiDimensionalGridChartDataFetcher
     extends AbstractJIRAChartDataFetcher<JIRABiDimensionalGridChartMacroParameter,
     JIRABiDimensionalGridChartJIRADataSource>
 {
+    private static final String FILTER_ID = "filterId";
+
     @Override
     public JIRAURLHelper.GadgetType getGadgetType()
     {
@@ -67,6 +69,12 @@ public List<NameValuePair> getCustomQueryParameters(JIRABiDimensionalGridChartMa
     @Override
     public NameValuePair handleFilterIdParameter(String filterIdValue)
     {
-        return new BasicNameValuePair("filterId", computeFilterIdFormat(filterIdValue, true));
+        return new BasicNameValuePair(FILTER_ID, computeFilterIdFormat(filterIdValue, true));
+    }
+
+    @Override
+    public NameValuePair handleQueryParameter(String queryValue)
+    {
+        return new BasicNameValuePair(FILTER_ID, "jql-" + queryValue);
     }
 }