filter required parameters for query execution

Author: gdalecka

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/actions/execute/ExecuteQueryAction.java

@@ -87,7 +87,7 @@ public void actionPerformed(AnActionEvent e) {
         Map<String, Object> parameters;
         try {
             ParametersService service = ServiceManager.getService(project, ParametersService.class);
-            parameters = service.getParameters();
+            parameters = service.getParameters(content);
         } catch (Exception exception) {
             sendParametersRetrievalErrorEvent(messageBus, exception, editor);
             return;

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/params/ParametersService.java

@@ -9,7 +9,10 @@
 import org.apache.commons.lang.StringUtils;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class ParametersService {
 
@@ -31,11 +34,37 @@ public void registerParametersProvider(final ParametersProvider parametersProvid
         this.parametersProvider = parametersProvider;
     }
 
-    public Map<String, Object> getParameters() throws Exception {
+    public Map<String, Object> getParameters(String queryContent) throws Exception {
         if (!isValidParametersMap(parametersProvider.getParametersJson())) {
             return Collections.emptyMap();
         }
-        return MAPPER.readValue(parametersProvider.getParametersJson(), new TypeReference<Map<String, Object>>() { });
+
+        Map<String, Object> allParameters = MAPPER
+                .readValue(parametersProvider.getParametersJson(), new TypeReference<Map<String, Object>>() { });
+
+        return extractQueryParameters(queryContent, allParameters);
+    }
+
+    private Map<String, Object> extractQueryParameters(String query, Map<String, Object> allParameters) {
+        if (StringUtils.isBlank(query)) {
+            return Collections.emptyMap();
+        }
+
+        List<String> parameterNames = extractParameterNames(query);
+        if (parameterNames.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        return allParameters.entrySet().stream()
+                .filter(entry -> parameterNames.contains(entry.getKey()))
+                .collect(Collectors.toMap(p -> p.getKey(), p -> p.getValue()));
+    }
+
+    private List<String> extractParameterNames(String query) {
+        return Stream.of(query.split("\\s")) // split by whitespace character
+                .filter(w -> w.startsWith("$"))
+                .map(w -> w.substring(1))
+                .collect(Collectors.toList());
     }
 
     private static boolean isValidParametersMap(String parametersJson) {

ui/jetbrains/src/test/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/params/ParametersServiceTest.java

@@ -35,7 +35,8 @@ public void setup() {
     @Test
     public void testParsingEmptyJsonObject() throws Exception {
         parametersProvider.setParametersJson("{}");
-        Map<String, Object> result = parametersService.getParameters();
+        Map<String, Object> result = parametersService
+                .getParameters("match (p:Person) return p;");
 
         assertThat(result.isEmpty()).isTrue();
     }
@@ -51,7 +52,8 @@ public void testParsingEmptyParameters() throws Exception {
     @Test
     public void testParsingStringParameter() throws Exception {
         parametersProvider.setParametersJson("{\"name\": \"Anna\"}");
-        Map<String, Object> result = parametersService.getParameters();
+        Map<String, Object> result = parametersService
+                .getParameters("match (p:Person) where p.name = $name return *");
 
         assertThat(result.keySet().contains("name")).isTrue();
         assertThat(result.values().contains("Anna")).isTrue();
@@ -60,23 +62,26 @@ public void testParsingStringParameter() throws Exception {
     @Test
     public void testParsingIntegerParameter() throws Exception {
         parametersProvider.setParametersJson("{\"p1\": 17}");
-        Map<String, Object> result = parametersService.getParameters();
+        Map<String, Object> result = parametersService
+                .getParameters("match (p:Person) where p.age = $p1 return *");
 
         assertThat(result.get("p1").toString()).isEqualTo("17");
     }
 
     @Test
     public void testParsingBooleanParameter() throws Exception {
         parametersProvider.setParametersJson("{\"p2\": false}");
-        Map<String, Object> result = parametersService.getParameters();
+        Map<String, Object> result = parametersService.
+                getParameters("match (p:Person) where p.is_citizen = $p2 return *");
 
         assertThat(result.get("p2").toString()).isEqualTo("false");
     }
 
     @Test
     public void testParsingJsonObjectParameter() throws Exception {
         parametersProvider.setParametersJson("{\"p3\": {\"name\":\"Alex\"}}");
-        Map<String, Object> result = parametersService.getParameters();
+        Map<String, Object> result = parametersService.
+                getParameters("match (p:Person) where p.father = $p3 return *");
 
         Map<String, Object> jsonVal = (Map<String, Object>) result.get("p3");
         assertThat(jsonVal).containsKey("name");
@@ -86,7 +91,10 @@ public void testParsingJsonObjectParameter() throws Exception {
     @Test
     public void testParsingMultipleParameters() throws Exception {
         parametersProvider.setParametersJson("{\"firstName\": \"Kaleb\", \"lastName\": \"Johnson\"}");
-        Map<String, Object> result = parametersService.getParameters();
+        Map<String, Object> result = parametersService
+                .getParameters("match (p:Person)\n" +
+                        "where p.first_name = $firstName " +
+                        "   and p.last_name = $lastName return *");
 
         assertThat(result.get("firstName").toString()).isEqualTo("Kaleb");
         assertThat(result.get("lastName").toString()).isEqualTo("Johnson");