More review changes.

Author: BarsaTM

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

@@ -164,7 +164,7 @@ private String printException(Exception exception) {
             errorMessage = exception.toString();
         }
         error(errorMessage);
-        String newLine = "\n";
+        String newLine = System.lineSeparator();
         String details = exception.getMessage() + newLine + getCause(exception) + newLine + getStackTrace(exception);
         log.printHyperlink(" " + SHOW_DETAILS, p -> showPopup("Error details", details, exception));
         newLine();

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/util/ExceptionErrorMessages.java

@@ -1,7 +1,8 @@
 package com.neueda.jetbrains.plugin.graphdb.jetbrains.util;
 
 public enum ExceptionErrorMessages {
-    SYNTAX_EXCEPTION("Please note that Cypher query is translated to Gremlin and may fail" +
+    ERROR_OCCURRED("Error occurred."),
+    SYNTAX_WARNING("Please note that Cypher query is translated to Gremlin and may fail " +
             "because of translation or database specifics. Make sure that flavor is properly configured in database connection configuration."),
     SERIALIZER_EXCEPTION("Wrong serializer selected. Please check connection configuration."),
     RESPONSE_EXCEPTION("Database connection failed. Please check database configuration and retry to connect."),

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/util/ExceptionWrapper.java

@@ -51,6 +51,9 @@ public static String getStackTrace(final Throwable throwable) {
 
     public static String wrapExceptionInMeaningMessage(Exception exception) {
         String exceptionMessage = exception.getMessage();
+        if (exceptionMessage.isEmpty()) {
+            return ExceptionErrorMessages.ERROR_OCCURRED.getDescription();
+        }
         if (exceptionMessage.contains("SerializationException")) {
             return ExceptionErrorMessages.SERIALIZER_EXCEPTION.getDescription();
         }
@@ -61,7 +64,7 @@ public static String wrapExceptionInMeaningMessage(Exception exception) {
             return ExceptionErrorMessages.CONNECTION_EXCEPTION.getDescription();
         }
         if (exceptionMessage.contains("SyntaxException")) {
-            return ExceptionErrorMessages.SYNTAX_EXCEPTION.getDescription();
+            return ExceptionErrorMessages.SYNTAX_WARNING.getDescription();
         }
         if (exceptionMessage.length() > SHORT_STRING_LENGTH) {
             return ellipseString(exceptionMessage, SHORT_STRING_LENGTH);

ui/jetbrains/src/test/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/helpers/ExceptionWrapperTest.java

@@ -1,8 +1,13 @@
 package com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.helpers;
 
+import com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionErrorMessages;
 import com.neueda.jetbrains.plugin.graphdb.jetbrains.util.ExceptionWrapper;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.opencypher.v9_0.util.SyntaxException;
 
+import static org.hamcrest.core.Is.*;
 import static org.junit.Assert.*;
 
 public class ExceptionWrapperTest {
@@ -14,4 +19,26 @@ public void shouldEllipseString() throws Exception {
         String truncatedString = ExceptionWrapper.ellipseString(longString, ExceptionWrapper.SHORT_STRING_LENGTH);
         assertEquals(shortString, truncatedString);
     }
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test(expected = SyntaxException.class)
+    public void shouldWrapExceptionInMeaningMessage() throws Exception {
+        try {
+            TestThing testThing = new TestThing();
+            testThing.chuck();
+            fail("should have thrown");
+        } catch (SyntaxException e) {
+            assertThat(ExceptionWrapper.wrapExceptionInMeaningMessage(e), is(ExceptionErrorMessages.SYNTAX_WARNING));
+        }
+
+    }
+
+    private class TestThing {
+        public void chuck() {
+            String exceptionMessage = "org.opencypher.v9_0.util.SyntaxException: Invalid input 'R':...";
+            throw new SyntaxException(exceptionMessage);
+        }
+    }
 }