JBPM-7103 - KIE Server custom queries exposed as DataSet editor in wo…

…rkbench (#1169)
kiegroup · Apr 12, 2018 · 0e09565 · 0e09565
1 parent 23b30bd
commit 0e09565
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 6 deletions.
diff --git a/...es/jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/query/QueryServiceImpl.java b/...es/jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/query/QueryServiceImpl.java
@@ -181,6 +181,7 @@ public void replaceQuery(QueryDefinition queryDefinition) {
                 for (String columnId : metadata.getColumnIds()) {
                     logger.debug("Column {} is of type {}", columnId, metadata.getColumnType(columnId));
                     sqlDef.addColumn(columnId, metadata.getColumnType(columnId));
+                    sqlQueryDefinition.getColumns().put(columnId, metadata.getColumnType(columnId).toString());
                 }
 
                 logger.info("Registered {} query successfully", queryDefinition.getName());
@@ -280,7 +281,14 @@ public QueryDefinition getQuery(String uniqueQueryName) throws QueryNotFoundExce
         List<QueryDefinitionEntity> queries = commandService.execute(new QueryNameCommand<List<QueryDefinitionEntity>>("getQueryDefinitionByName", params));
 
         if (queries.size() == 1) {
-            return queries.get(0).toQueryDefinition();
+            QueryDefinition def = queries.get(0).toQueryDefinition();
+
+            DataSetMetadata metadata = dataSetManager.getDataSetMetadata(def.getName());
+            for (String columnId : metadata.getColumnIds()) {
+                def.getColumns().put(columnId, metadata.getColumnType(columnId).toString());
+            }
+
+            return def;
         }
         throw new QueryNotFoundException("Query " + uniqueQueryName + " not found");
     }

diff --git a/.../jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/query/SqlQueryDefinition.java b/.../jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/query/SqlQueryDefinition.java
@@ -33,7 +33,7 @@ public class SqlQueryDefinition implements QueryDefinition, Serializable {
 
     private Target target = Target.CUSTOM;
 
-    private Map<String, String> columnsMapping = new HashMap<String, String>();
+    private Map<String, String> columns = new HashMap<String, String>();
 
     public SqlQueryDefinition(String name, String source) {
         this.name = name;
@@ -97,12 +97,12 @@ public String toString() {
                 "{ expression=" + expression + "}]";
     }
 
-    public Map<String, String> getColumnsMapping() {
+    public Map<String, String> getColumns() {
-        return columnsMapping;
+        return columns;
     }
 
-    public void setColumnsMapping(Map<String, String> columnsMapping) {
+    public void setColumns(Map<String, String> columns) {
-        this.columnsMapping = columnsMapping;
+        this.columns = columns;
     }
 
 }
diff --git a/...ices/jbpm-kie-services/src/test/java/org/jbpm/kie/services/test/QueryServiceImplTest.java b/...ices/jbpm-kie-services/src/test/java/org/jbpm/kie/services/test/QueryServiceImplTest.java
@@ -225,6 +225,10 @@ public void testGetProcessInstances() {
         assertEquals(query.getSource(), registeredQuery.getSource());
         assertEquals(query.getExpression(), registeredQuery.getExpression());
         assertEquals(query.getTarget(), registeredQuery.getTarget());
+
+        Map<String, String> resolvedColumns = registeredQuery.getColumns();
+        assertNotNull(resolvedColumns);
+        assertEquals(18, resolvedColumns.size());
 
         Collection<ProcessInstanceDesc> instances = queryService.query(query.getName(), ProcessInstanceQueryMapper.get(), new QueryContext());
         assertNotNull(instances);

diff --git a/jbpm-services/jbpm-services-api/src/build/revapi-config.json b/jbpm-services/jbpm-services-api/src/build/revapi-config.json
@@ -829,6 +829,15 @@
          "methodName": "getSlaDueDate",
          "elementKind": "method",
          "justification": "Aded support for time based SLA tracking"
+         },
+         {
+          "code": "java.method.addedToInterface",
+          "new": "method java.util.Map<java.lang.String, java.lang.String> org.jbpm.services.api.query.model.QueryDefinition::getColumns()",
+          "package": "org.jbpm.services.api.query.model",
+          "classSimpleName": "QueryDefinition",
+          "methodName": "getColumns",
+          "elementKind": "method",
+          "justification": "Expose query definition resolved columns"
          }
       ]
     }

diff --git a/...es/jbpm-services-api/src/main/java/org/jbpm/services/api/query/model/QueryDefinition.java b/...es/jbpm-services-api/src/main/java/org/jbpm/services/api/query/model/QueryDefinition.java
@@ -16,6 +16,7 @@
 
 package org.jbpm.services.api.query.model;
 
+import java.util.Map;
 
 /**
  * Definition of a query that can be registered in the query service
@@ -78,4 +79,9 @@ public enum Target {
      * @return
      */
     Target getTarget();
+
+    /**
+     * Returns resolved columns types once the query was successfully registered.
+     */
+    Map<String, String> getColumns();
 }