Params with comment only (#29)

* return empty parameters list if no json node read
* parameters panel - ignore anything, that is not a map
* Validate only for nullines and emptyness
* paramters service test fixes

Author: gdalecka

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/console/log/LogPanel.java

@@ -91,7 +91,7 @@ public void metadataRefreshFailed(DataSourceApi nodeDataSource, Exception except
 
         messageBus.connect().subscribe(QueryParametersRetrievalErrorEvent.QUERY_PARAMETERS_RETRIEVAL_ERROR_EVENT_TOPIC,
                 (exception, editor) -> {
-                    error(PARAMS_ERROR_COMMON_MSG);
+                    error(String.format("%s ", PARAMS_ERROR_COMMON_MSG));
                     printException(exception);
                 });
     }

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

@@ -3,7 +3,9 @@
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Throwables;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.Collections;
@@ -30,10 +32,28 @@ public void registerParametersProvider(final ParametersProvider parametersProvid
     }
 
     public Map<String, Object> getParameters() throws Exception {
-        if (parametersProvider == null || StringUtils.isBlank(parametersProvider.getParametersJson())) {
+        if (!isValidParametersMap(parametersProvider.getParametersJson())) {
             return Collections.emptyMap();
         }
         return MAPPER.readValue(parametersProvider.getParametersJson(), new TypeReference<Map<String, Object>>() { });
     }
 
+    private static boolean isValidParametersMap(String parametersJson) {
+        try {
+            if (parametersJson == null || StringUtils.isBlank(parametersJson)) {
+                return false;
+            }
+
+            JsonParser parser = FACTORY.createParser(parametersJson);
+            JsonNode node = MAPPER.readTree(parser);
+            if (node == null) {
+                return false;
+            }
+        } catch (Exception e) {
+            throw Throwables.propagate(e);
+        }
+
+        return true;
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.params;
 
+import com.fasterxml.jackson.databind.JsonMappingException;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -39,6 +40,14 @@ public void testParsingEmptyJsonObject() throws Exception {
         assertThat(result.isEmpty()).isTrue();
     }
 
+    @Test
+    public void testParsingEmptyParameters() throws Exception {
+        parametersProvider.setParametersJson("");
+        Map<String, Object> result = parametersService.getParameters();
+
+        assertThat(result.isEmpty()).isTrue();
+    }
+
     @Test
     public void testParsingStringParameter() throws Exception {
         parametersProvider.setParametersJson("{\"name\": \"Anna\"}");
@@ -83,4 +92,51 @@ public void testParsingMultipleParameters() throws Exception {
         assertThat(result.get("lastName").toString()).isEqualTo("Johnson");
     }
 
+    @Test
+    public void testParsingCommentOnly() throws Exception {
+        parametersProvider.setParametersJson("// Provide query parameters in JSON format here:");
+        Map<String, Object> result = parametersService.getParameters();
+
+        assertThat(result.isEmpty()).isTrue();
+    }
+
+
+    @Test
+    public void testParsingCommentWithParameter() throws Exception {
+        parametersProvider.setParametersJson("// Provide query parameters in JSON format here:\n{\"name\": \"Eva\"}");
+        Map<String, Object> result = parametersService.getParameters();
+
+        assertThat(result.size() == 1).isTrue();
+    }
+
+    @Test(expected = Exception.class)
+    public void testParsingJsonArray() throws Exception {
+        parametersProvider.setParametersJson("// Provide query parameters in JSON format here:\n[\"item1\",\"item2\"]");
+        parametersService.getParameters();
+    }
+
+    @Test(expected = JsonMappingException.class)
+    public void testParsingNumber() throws Exception {
+        parametersProvider.setParametersJson("1");
+        parametersService.getParameters();
+    }
+
+    @Test(expected = JsonMappingException.class)
+    public void testParsingString() throws Exception {
+        parametersProvider.setParametersJson("\"abc\"");
+        parametersService.getParameters();
+    }
+
+    @Test(expected = JsonMappingException.class)
+    public void testParsingUnwrappedParameter() throws Exception {
+        parametersProvider.setParametersJson("\"param1\":\"val1\"");
+        parametersService.getParameters();
+    }
+
+    @Test(expected = Exception.class)
+    public void testParsingParamWithObjAccessor() throws Exception {
+        parametersProvider.setParametersJson("{\"param1\": person[\"name\"]}");
+        parametersService.getParameters();
+    }
+
 }