#4484 Change selection handling to use fully qualified keys

Author: stroomdev66

stroom-core-client/src/main/java/stroom/dashboard/client/main/DashboardContext.java

@@ -15,10 +15,9 @@
 
 public interface DashboardContext extends ParamValues {
 
+    @Deprecated
     List<Param> getParams();
 
-    List<Param> getLinkParams();
-
     TimeRange getRawTimeRange();
 
     TimeRange getResolvedTimeRange();
@@ -29,6 +28,8 @@ public interface DashboardContext extends ParamValues {
 
     SafeHtml toSafeHtml();
 
+    ExpressionOperator replaceExpression(ExpressionOperator operator, boolean keepUnmatched);
+
     Optional<ExpressionOperator> createSelectionHandlerExpression(List<ComponentSelectionHandler> selectionHandlers);
 
     HandlerRegistration addComponentChangeHandler(ComponentChangeEvent.Handler handler);

stroom-core-client/src/main/java/stroom/dashboard/client/main/DashboardContextImpl.java

@@ -598,8 +598,7 @@ private void run(final boolean incremental,
             ExpressionOperator decorated = ExpressionUtil.combine(root, expressionDecorator);
 
             final DashboardContext dashboardContext = getDashboardContext();
-            decorated = ExpressionUtil
-                    .replaceExpressionParameters(decorated, dashboardContext, true);
+            decorated = dashboardContext.replaceExpression(decorated, true);
 
             // Start search.
             searchModel.startNewSearch(
@@ -629,7 +628,7 @@ private void resume(final String node,
             // Write expression.
             ExpressionOperator root = expressionPresenter.write();
             final DashboardContext dashboardContext = getDashboardContext();
-            root = ExpressionUtil.replaceExpressionParameters(root, dashboardContext, true);
+            root = dashboardContext.replaceExpression(root, true);
 
             // Start search.
             searchModel.startNewSearch(

stroom-core-client/src/main/java/stroom/dashboard/client/query/QueryPresenter.java

@@ -1108,17 +1108,15 @@ public TableSettings resolveTableSettings() {
         if (rulesIn != null) {
             List<ConditionalFormattingRule> rulesOut = new ArrayList<>(rulesIn.size());
             rulesIn.forEach(rule -> {
-                rulesOut.add(rule.copy().expression(ExpressionUtil.replaceExpressionParameters(rule.getExpression(),
-                        dashboardContext,
+                rulesOut.add(rule.copy().expression(dashboardContext.replaceExpression(rule.getExpression(),
                         true)).build());
             });
             builder.conditionalFormattingRules(rulesOut);
         }
 
         ExpressionOperator aggregateFilter = currentSelectionFilter;
         if (currentSelectionFilter != null) {
-            aggregateFilter = ExpressionUtil
-                    .replaceExpressionParameters(aggregateFilter, dashboardContext, true);
+            aggregateFilter = dashboardContext.replaceExpression(aggregateFilter, true);
         }
 
         return builder.buildTableSettings().copy().aggregateFilter(aggregateFilter).build();

stroom-core-client/src/main/java/stroom/dashboard/client/table/TablePresenter.java

@@ -347,17 +347,17 @@ private void update(final HasComponentSelection hasSelectedRows) {
                     final ComponentSelection selected = selection.get(0);
                     currentStreamId = getLong(getTextSettings().getStreamIdColumn(), selected);
                     if (currentStreamId == null) {
-                        currentStreamId = getLong(selected.get(SpecialColumns.RESERVED_STREAM_ID));
+                        currentStreamId = getLong(selected.getParamValue(SpecialColumns.RESERVED_STREAM_ID));
                         if (currentStreamId == null) {
-                            currentStreamId = getLong(selected.get(OLD_STREAM_ID));
+                            currentStreamId = getLong(selected.getParamValue(OLD_STREAM_ID));
                         }
                     }
                     currentPartIndex = convertToIndex(getLong(getTextSettings().getPartNoColumn(), selected));
                     currentRecordIndex = convertToIndex(getLong(getTextSettings().getRecordNoColumn(), selected));
                     if (currentRecordIndex == null) {
-                        currentRecordIndex = getLong(selected.get(SpecialColumns.RESERVED_EVENT_ID));
+                        currentRecordIndex = getLong(selected.getParamValue(SpecialColumns.RESERVED_EVENT_ID));
                         if (currentRecordIndex == null) {
-                            currentRecordIndex = getLong(selected.get(OLD_EVENT_ID));
+                            currentRecordIndex = getLong(selected.getParamValue(OLD_EVENT_ID));
                         }
                     }
                     final Long currentLineFrom = getLong(getTextSettings().getLineFromColumn(), selected);
@@ -546,9 +546,9 @@ private Long convertToIndex(final Long no) {
 
     private Long getLong(final ColumnRef column, final ComponentSelection row) {
         if (column != null && row != null) {
-            String val = row.get(column.getId());
+            String val = row.getParamValue(column.getId());
             if (val == null) {
-                val = row.get(column.getName());
+                val = row.getParamValue(column.getName());
             }
             return getLong(val);
         }

stroom-core-client/src/main/java/stroom/dashboard/client/text/TextPresenter.java

@@ -63,7 +63,7 @@ public List<Param> getParams() {
     }
 
     @Override
-    public String get(final String key) {
+    public String getParamValue(final String key) {
         return values.get(key);
     }
 }

stroom-core-client/src/main/java/stroom/query/client/presenter/TableComponentSelection.java

@@ -59,7 +59,7 @@ public List<Param> getParams() {
     }
 
     @Override
-    public String get(final String key) {
+    public String getParamValue(final String key) {
         return values.get(key);
     }
 }

stroom-core-client/src/main/java/stroom/query/client/presenter/VisComponentSelection.java

@@ -141,7 +141,7 @@ public static String replaceParameters(final String value,
                     key = key.substring(0, defaultValueIndex);
                 }
 
-                final String paramValue = paramValues.get(key);
+                final String paramValue = paramValues.getParamValue(key);
                 if (paramValue != null) {
                     if (containsWhitespace(paramValue)) {
                         sb.append("'");

stroom-query/stroom-query-api/src/main/java/stroom/query/api/ParamUtil.java

@@ -2,5 +2,5 @@
 
 public interface ParamValues {
 
-    String get(String key);
+    String getParamValue(String key);
 }

stroom-query/stroom-query-api/src/main/java/stroom/query/api/ParamValues.java

@@ -11,7 +11,7 @@ public ParamValuesImpl(final Map<String, String> map) {
     }
 
     @Override
-    public String get(final String key) {
+    public String getParamValue(final String key) {
         return map.get(key);
     }
 }