Don't use separate error classes for run-time and compile-time exceptions (#108)

Co-authored-by: DvirDukhan <[email protected]>

Author: jeffreylovitz

src/main/java/com/redislabs/redisgraph/exceptions/JRedisGraphCompileTimeException.java

@@ -0,0 +1,21 @@
+package com.redislabs.redisgraph.exceptions;
+
+import redis.clients.jedis.exceptions.JedisDataException;
+
+/**
+ * RedisGraph query evaluation exception. An instance of JRedisGraphException is thrown when RedisGraph
+ * encounters an error during query evaluation.
+ */
+public class JRedisGraphException extends JedisDataException {
+    public JRedisGraphException(String message) {
+        super(message);
+    }
+
+    public JRedisGraphException(Throwable cause) {
+        super(cause);
+    }
+
+    public JRedisGraphException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/com/redislabs/redisgraph/exceptions/JRedisGraphException.java

@@ -2,8 +2,7 @@
 
 import com.redislabs.redisgraph.RedisGraphContext;
 import com.redislabs.redisgraph.ResultSet;
-import com.redislabs.redisgraph.exceptions.JRedisGraphCompileTimeException;
-import com.redislabs.redisgraph.exceptions.JRedisGraphRunTimeException;
+import com.redislabs.redisgraph.exceptions.JRedisGraphException;
 import com.redislabs.redisgraph.impl.Utils;
 import com.redislabs.redisgraph.impl.graph_cache.RedisGraphCaches;
 import com.redislabs.redisgraph.impl.resultset.ResultSetImpl;
@@ -52,11 +51,11 @@ protected ResultSet sendQuery(String graphId, String preparedQuery) {
             List<Object> rawResponse = (List<Object>) conn.sendCommand(RedisGraphCommand.QUERY, graphId, preparedQuery, Utils.COMPACT_STRING);
             return new ResultSetImpl(rawResponse, this, caches.getGraphCache(graphId));
         }
-        catch (JRedisGraphRunTimeException rt) {
+        catch (JRedisGraphException rt) {
             throw rt;
         }
         catch (JedisDataException j) {
-            throw new JRedisGraphCompileTimeException(j);
+            throw new JRedisGraphException(j);
         }
     }
 
@@ -75,11 +74,11 @@ protected ResultSet sendQuery(String graphId, String preparedQuery, long timeout
                 graphId, preparedQuery, Utils.COMPACT_STRING, Utils.TIMEOUT_STRING, Long.toString(timeout));
             return new ResultSetImpl(rawResponse, this, caches.getGraphCache(graphId));
         }
-        catch (JRedisGraphRunTimeException rt) {
+        catch (JRedisGraphException rt) {
             throw rt;
         }
         catch (JedisDataException j) {
-            throw new JRedisGraphCompileTimeException(j);
+            throw new JRedisGraphException(j);
         }
     }
 

src/main/java/com/redislabs/redisgraph/exceptions/JRedisGraphRunTimeException.java

@@ -5,7 +5,7 @@
 import com.redislabs.redisgraph.RedisGraph;
 import com.redislabs.redisgraph.ResultSet;
 import com.redislabs.redisgraph.Statistics;
-import com.redislabs.redisgraph.exceptions.JRedisGraphRunTimeException;
+import com.redislabs.redisgraph.exceptions.JRedisGraphException;
 import com.redislabs.redisgraph.graph_entities.*;
 import com.redislabs.redisgraph.impl.graph_cache.GraphCache;
 import redis.clients.jedis.util.SafeEncoder;
@@ -37,7 +37,7 @@ public ResultSetImpl(List<Object> rawResponse, RedisGraph redisGraph, GraphCache
         // If a run-time error occurred, the last member of the rawResponse will be a JedisDataException.
         if (rawResponse.get(rawResponse.size() - 1) instanceof JedisDataException) {
 
-            throw new JRedisGraphRunTimeException((Throwable) rawResponse.get(rawResponse.size() - 1));
+            throw new JRedisGraphException((Throwable) rawResponse.get(rawResponse.size() - 1));
         }
 
         if (rawResponse.size() != 3) {

src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java

@@ -34,7 +34,7 @@ public void deleteGraph() {
 
     @Test
     public void testSyntaxErrorReporting() {
-        exceptionRule.expect(JRedisGraphCompileTimeException.class);
+        exceptionRule.expect(JRedisGraphException.class);
         exceptionRule.expectMessage("Type mismatch: expected String but was Integer");
 
         // Issue a query that causes a compile-time error
@@ -44,7 +44,7 @@ public void testSyntaxErrorReporting() {
 
     @Test
     public void testRuntimeErrorReporting() {
-        exceptionRule.expect(JRedisGraphRunTimeException.class);
+        exceptionRule.expect(JRedisGraphException.class);
         exceptionRule.expectMessage("Type mismatch: expected String but was Integer");
 
         // Issue a query that causes a run-time error
@@ -59,7 +59,7 @@ public void testExceptionFlow() {
             api.query("social", "RETURN toUpper(5)");
         }
         catch (Exception e) {
-            Assert.assertEquals(JRedisGraphCompileTimeException.class, e.getClass());
+            Assert.assertEquals(JRedisGraphException.class, e.getClass());
             Assert.assertTrue( e.getMessage().contains("Type mismatch: expected String but was Integer"));
         }
 
@@ -70,7 +70,7 @@ public void testExceptionFlow() {
             api.query("social", "MATCH (p:person) RETURN toUpper(p.mixed_prop)");
         }
         catch (Exception e) {
-            Assert.assertEquals(JRedisGraphRunTimeException.class, e.getClass());
+            Assert.assertEquals(JRedisGraphException.class, e.getClass());
             Assert.assertTrue( e.getMessage().contains("Type mismatch: expected String but was Integer"));
         }
 
@@ -79,7 +79,7 @@ public void testExceptionFlow() {
 
     @Test
     public void testContextSyntaxErrorReporting() {
-        exceptionRule.expect(JRedisGraphCompileTimeException.class);
+        exceptionRule.expect(JRedisGraphException.class);
         exceptionRule.expectMessage("Type mismatch: expected String but was Integer");
         RedisGraphContext c = api.getContext();
 
@@ -90,21 +90,21 @@ public void testContextSyntaxErrorReporting() {
 
     @Test
     public void testMissingParametersSyntaxErrorReporting(){
-        exceptionRule.expect(JRedisGraphRunTimeException.class);
+        exceptionRule.expect(JRedisGraphException.class);
         exceptionRule.expectMessage("Missing parameters");
         api.query("social","RETURN $param");
     }
 
     @Test
     public void testMissingParametersSyntaxErrorReporting2(){
-        exceptionRule.expect(JRedisGraphRunTimeException.class);
+        exceptionRule.expect(JRedisGraphException.class);
         exceptionRule.expectMessage("Missing parameters");
         api.query("social","RETURN $param", new HashMap<>());
     }
 
     @Test
     public void testContextRuntimeErrorReporting() {
-        exceptionRule.expect(JRedisGraphRunTimeException.class);
+        exceptionRule.expect(JRedisGraphException.class);
         exceptionRule.expectMessage("Type mismatch: expected String but was Integer");
 
         RedisGraphContext c = api.getContext();
@@ -122,7 +122,7 @@ public void testContextExceptionFlow() {
             c.query("social", "RETURN toUpper(5)");
         }
         catch (Exception e) {
-            Assert.assertEquals(JRedisGraphCompileTimeException.class, e.getClass());
+            Assert.assertEquals(JRedisGraphException.class, e.getClass());
             Assert.assertTrue( e.getMessage().contains("Type mismatch: expected String but was Integer"));
         }
 
@@ -133,15 +133,15 @@ public void testContextExceptionFlow() {
             c.query("social", "MATCH (p:person) RETURN toUpper(p.mixed_prop)");
         }
         catch (Exception e) {
-            Assert.assertEquals(JRedisGraphRunTimeException.class, e.getClass());
+            Assert.assertEquals(JRedisGraphException.class, e.getClass());
             Assert.assertTrue( e.getMessage().contains("Type mismatch: expected String but was Integer"));
         }
 
     }
 
     @Test
     public void timeoutExcpetion() {
-        exceptionRule.expect(JRedisGraphRunTimeException.class);
+        exceptionRule.expect(JRedisGraphException.class);
         exceptionRule.expectMessage("Query timed out");
 
         api.query("social", "UNWIND range(0,100000) AS x WITH x AS x WHERE x = 10000 RETURN x", 1L);