remove marker interface and add property to neo4j exceptions

neo4j · May 11, 2022 · fe764a8 · fe764a8
1 parent 70160d0
commit fe764a8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/Neo4j.Driver/Neo4j.Driver/Internal/Extensions/ErrorExtensions.cs b/Neo4j.Driver/Neo4j.Driver/Internal/Extensions/ErrorExtensions.cs
@@ -74,7 +74,7 @@ public static Neo4jException ParseServerException(string code, string message)
 
         public static bool IsRetriableError(this Exception error)
         {
-            return error is IRetriableNeo4jException;
+            return error is Neo4jException neo4JException && neo4JException.CanBeRetried;
         }
 
         public static bool IsRecoverableError(this Exception error)

diff --git a/Neo4j.Driver/Neo4j.Driver/Neo4jException.cs b/Neo4j.Driver/Neo4j.Driver/Neo4jException.cs
@@ -20,19 +20,13 @@
 
 namespace Neo4j.Driver
 {
-    /// <summary>
-    /// Marker interface for Neo4j exceptions that can be retried.
-    /// </summary>
-    public interface IRetriableNeo4jException
-    {
-    }
-
     /// <summary>
     /// The base class for all Neo4j exceptions.
     /// </summary>
     [DataContract]
     public class Neo4jException : Exception
     {
+        internal virtual bool CanBeRetried => false;
         /// <summary>
         /// Create a new <see cref="Neo4jException"/>
         /// </summary>
@@ -146,8 +140,10 @@ public ClientException(string code, string message, Exception innerException)
     /// The error code provided can be used to determine further details for the problem.
     /// </summary>
     [DataContract]
-    public class TransientException : Neo4jException, IRetriableNeo4jException
+    public class TransientException : Neo4jException
     {
+        internal override bool CanBeRetried => true;
+
         /// <summary>
         /// Create a new <see cref="TransientException"/>.
         /// </summary>
@@ -223,8 +219,10 @@ public DatabaseException(string code, string message, Exception innerException)
     ///  A <see cref="ServiceUnavailableException"/> indicates that the driver cannot communicate with the cluster.
     /// </summary>
     [DataContract]
-    public class ServiceUnavailableException : Neo4jException, IRetriableNeo4jException
+    public class ServiceUnavailableException : Neo4jException
     {
+        internal override bool CanBeRetried => true;
+
         /// <summary>
         /// Create a new <see cref="ServiceUnavailableException"/> with an error message.
         /// </summary>
@@ -250,8 +248,10 @@ public ServiceUnavailableException(string message, Exception innerException) : b
     /// A new session needs to be acquired from the driver and all actions taken on the expired session must be replayed.
     /// </summary>
     [DataContract]
-    public class SessionExpiredException : Neo4jException, IRetriableNeo4jException
+    public class SessionExpiredException : Neo4jException
     {
+        internal override bool CanBeRetried => true;
+
         /// <summary>
         /// Create a new <see cref="SessionExpiredException"/> with an error message.
         /// </summary>
@@ -274,8 +274,10 @@ public SessionExpiredException(string message, Exception innerException) : base(
     ///  A <see cref="ConnectionReadTimeoutException"/> indicates that the driver timed out trying to read from the network socket.
     /// </summary>
     [DataContract]
-    public class ConnectionReadTimeoutException : Neo4jException, IRetriableNeo4jException
+    public class ConnectionReadTimeoutException : Neo4jException
     {
+        internal override bool CanBeRetried => true;
+
         /// <summary>
         /// Create a new <see cref="ConnectionReadTimeoutException"/> with an error message.
         /// </summary>
@@ -397,8 +399,10 @@ public AuthenticationException(string message) : base(ErrorCode, message)
     /// <summary>
     /// The authorization information maintained on the server has expired. The client should reconnect.
     /// </summary>
-    public class AuthorizationException : SecurityException, IRetriableNeo4jException
+    public class AuthorizationException : SecurityException
     {
+        internal override bool CanBeRetried => true;
+
         private const string ErrorCode = "Neo.ClientError.Security.AuthorizationExpired";
 
         internal static bool IsAuthorizationError(string code)