Review changes

Author: BarsaTM

database/opencypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/database/opencypher/gremlin/OpenCypherGremlinDatabase.java

@@ -148,7 +148,8 @@ public GraphMetadata metadata() {
 
             return new OpenCypherGremlinGraphMetadata(labelResult, relResult, vertexPropResult, edgePropResult);
         } catch (InterruptedException | ExecutionException e) {
-            throw new RuntimeException(e);
+            String exceptionMessage = wrapExceptionInMeaningMessage(e);
+            throw new OpenCypherGremlinException(exceptionMessage, e);
         } finally {
             gremlinClient.close();
         }

database/opencypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/database/opencypher/gremlin/exceptions/ExceptionErrorMessages.java

@@ -5,8 +5,8 @@ public enum ExceptionErrorMessages {
     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."),
-    CONNECTION_EXCEPTION("Database connection failed. Please check database configuration and retry to connect.");
+    RESPONSE_EXCEPTION("Database connection failed. Please check database configuration (including username and password) and retry to connect."),
+    CONNECTION_EXCEPTION("Database connection failed. Please check database configuration (including username and password) and retry to connect.");
 
     private final String description;
 

database/opencypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/database/opencypher/gremlin/exceptions/ExceptionWrapper.java

@@ -1,9 +1,5 @@
 package com.neueda.jetbrains.plugin.graphdb.database.opencypher.gremlin.exceptions;
 
-import org.apache.tinkerpop.gremlin.driver.exception.ConnectionException;
-import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
@@ -38,10 +34,11 @@ public static String ellipseString(String text, int targetLength) {
 
     public static String getCause(Exception exception) {
         StringBuilder exceptionCauses = new StringBuilder();
-        Throwable cause = exception.getCause();
-        while (cause != null) {
-            exceptionCauses.append(cause.getMessage()).append("\n");
-            cause = cause.getCause();
+        Throwable cause = null;
+
+        while (exception.getCause() != null && exception.getCause() != cause) {
+            cause = exception.getCause();
+            exceptionCauses.append(cause).append("\n");
         }
         return exceptionCauses.toString();
     }
@@ -55,21 +52,22 @@ public static String getStackTrace(final Throwable throwable) {
 
     public static String wrapExceptionInMeaningMessage(Exception exception) {
         String exceptionMessage = exception.getMessage();
-        if (exceptionMessage.isEmpty()) {
+        if (exceptionMessage != null) {
+            if (exceptionMessage.contains("SerializationException")) {
+                return ExceptionErrorMessages.SERIALIZER_EXCEPTION.getDescription();
+            }
+            if (exceptionMessage.contains("ResponseException")) {
+                return ExceptionErrorMessages.RESPONSE_EXCEPTION.getDescription();
+            }
+            if (exceptionMessage.contains("ConnectionException")) {
+                return ExceptionErrorMessages.CONNECTION_EXCEPTION.getDescription();
+            }
+            if (exceptionMessage.length() > SHORT_STRING_LENGTH) {
+                return ellipseString(exceptionMessage, SHORT_STRING_LENGTH);
+            }
+            return exceptionMessage;
+        } else {
             return ExceptionErrorMessages.ERROR_OCCURRED.getDescription();
         }
-        if (exceptionMessage.contains("SerializationException")) {
-            return ExceptionErrorMessages.SERIALIZER_EXCEPTION.getDescription();
-        }
-        if (exceptionMessage.contains("ResponseException")) {
-            return ExceptionErrorMessages.RESPONSE_EXCEPTION.getDescription();
-        }
-        if (exceptionMessage.contains("ConnectionException")) {
-            return ExceptionErrorMessages.CONNECTION_EXCEPTION.getDescription();
-        }
-        if (exceptionMessage.length() > SHORT_STRING_LENGTH) {
-            return ellipseString(exceptionMessage, SHORT_STRING_LENGTH);
-        }
-        return exceptionMessage;
     }
 }

testing/integration-tinkerpop/src/test/java/com/neueda/jetbrains/plugin/graphdb/test/integration/opencypher/gremlin/OpenCypherGremlinDatabaseTestSecure.java

@@ -40,7 +40,8 @@ public void wrongCredentials() throws Exception {
         OpenCypherGremlinDatabase database = new OpenCypherGremlinDatabase(config);
 
         assertThatThrownBy(() -> database.execute("RETURN 1"))
-                    .hasMessageContaining("Username and/or password are incorrect");
+                    .hasMessageContaining("Database connection failed. Please check database configuration (including username and password) and retry" +
+                            "to connect.");
     }
 
     @Test

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

@@ -26,7 +26,6 @@
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.HashMap;
 import java.util.Map;
 
 import static com.neueda.jetbrains.plugin.graphdb.database.opencypher.gremlin.exceptions.ExceptionWrapper.*;
@@ -119,11 +118,9 @@ public void metadataRefreshSucceed(DataSourceApi nodeDataSource, DataSourceMetad
 
             @Override
             public void metadataRefreshFailed(DataSourceApi nodeDataSource, Exception exception) {
-                Map<String, String> exceptions = new HashMap<>();
                 String prefix = String.format("DataSource[%s] - metadata refresh failed. Reason: ", nodeDataSource.getName());
                 error(prefix);
-                String errorMessage = prefix + printException(exception) + "\n";
-                exceptions.put(errorMessage, exception.getMessage());
+                printException(exception);
                 newLine();
             }
         });
@@ -160,7 +157,7 @@ public void error(@Nullable String message) {
     private String printException(Exception exception) {
         String errorMessage;
         if (exception.getMessage() != null) {
-            errorMessage = wrapExceptionInMeaningMessage(exception);
+            errorMessage = exception.getMessage();
         } else {
             errorMessage = exception.toString();
         }