Updated error code according to server response

Author: pontusmelke

driver/src/main/java/org/neo4j/driver/internal/ClusteredNetworkSession.java

@@ -53,7 +53,7 @@ public StatementResult run( Statement statement )
         }
         catch ( ClientException e )
         {
-            if ( e.code().equals( "Neo.ClientError.General.ForbiddenOnFollower" ) )
+            if ( e.code().equals( "Neo.ClientError.Cluster.NotALeader" ) )
             {
                 onError.onWriteFailure( connection.address() );
                 throw new SessionExpiredException(

driver/src/main/java/org/neo4j/driver/internal/ClusteredStatementResult.java

@@ -256,6 +256,6 @@ private SessionExpiredException failedWrite()
 
     private boolean isFailedToWrite( ClientException e )
     {
-        return e.code().equals( "Neo.ClientError.General.ForbiddenOnFollower" );
+        return e.code().equals( "Neo.ClientError.Cluster.NotALeader" );
     }
 }

driver/src/test/java/org/neo4j/driver/internal/ClusteredNetworkSessionTest.java

@@ -88,7 +88,7 @@ public void shouldHandleConnectionFailures()
     public void shouldHandleWriteFailures()
     {
         // Given
-        doThrow( new ClientException( "Neo.ClientError.General.ForbiddenOnFollower", "oh no!" ) ).
+        doThrow( new ClientException( "Neo.ClientError.Cluster.NotALeader", "oh no!" ) ).
                 when( connection ).run( anyString(), any( Map.class ), any( Collector.class ) );
         ClusteredNetworkSession session =
                 new ClusteredNetworkSession( connection, onError, mock( Logger.class ) );

driver/src/test/java/org/neo4j/driver/internal/ClusteredStatementResultTest.java

@@ -68,7 +68,7 @@ public void shouldHandleWriteFailureOnConsume()
     {
         // Given
         when( delegate.consume() )
-                .thenThrow( new ClientException( "Neo.ClientError.General.ForbiddenOnFollower", "oh no!" ) );
+                .thenThrow( new ClientException( "Neo.ClientError.Cluster.NotALeader", "oh no!" ) );
         ClusteredStatementResult result =
                 new ClusteredStatementResult( delegate, LOCALHOST, onError );
 
@@ -117,7 +117,7 @@ public void shouldHandleWriteFailureOnHasNext()
     {
         // Given
         when( delegate.hasNext() )
-                .thenThrow( new ClientException( "Neo.ClientError.General.ForbiddenOnFollower", "oh no!" ) );
+                .thenThrow( new ClientException( "Neo.ClientError.Cluster.NotALeader", "oh no!" ) );
         ClusteredStatementResult result =
                 new ClusteredStatementResult( delegate, LOCALHOST, onError );
 
@@ -166,7 +166,7 @@ public void shouldHandleWriteFailureOnKeys()
     {
         // Given
         when( delegate.keys() )
-                .thenThrow( new ClientException( "Neo.ClientError.General.ForbiddenOnFollower", "oh no!" ) );
+                .thenThrow( new ClientException( "Neo.ClientError.Cluster.NotALeader", "oh no!" ) );
         ClusteredStatementResult result =
                 new ClusteredStatementResult( delegate, LOCALHOST, onError );
 
@@ -215,7 +215,7 @@ public void shouldHandleWriteFailureOnList()
     {
         // Given
         when( delegate.list() )
-                .thenThrow( new ClientException( "Neo.ClientError.General.ForbiddenOnFollower", "oh no!" ) );
+                .thenThrow( new ClientException( "Neo.ClientError.Cluster.NotALeader", "oh no!" ) );
         ClusteredStatementResult result =
                 new ClusteredStatementResult( delegate, LOCALHOST, onError );
 
@@ -264,7 +264,7 @@ public void shouldHandleWriteFailureOnNext()
     {
         // Given
         when( delegate.next() )
-                .thenThrow( new ClientException( "Neo.ClientError.General.ForbiddenOnFollower", "oh no!" ) );
+                .thenThrow( new ClientException( "Neo.ClientError.Cluster.NotALeader", "oh no!" ) );
         ClusteredStatementResult result =
                 new ClusteredStatementResult( delegate, LOCALHOST, onError );
 
@@ -313,7 +313,7 @@ public void shouldHandleWriteFailureOnPeek()
     {
         // Given
         when( delegate.peek() )
-                .thenThrow( new ClientException( "Neo.ClientError.General.ForbiddenOnFollower", "oh no!" ) );
+                .thenThrow( new ClientException( "Neo.ClientError.Cluster.NotALeader", "oh no!" ) );
         ClusteredStatementResult result =
                 new ClusteredStatementResult( delegate, LOCALHOST, onError );
 
@@ -362,7 +362,7 @@ public void shouldHandleWriteFailureOnSingle()
     {
         // Given
         when( delegate.single() )
-                .thenThrow( new ClientException( "Neo.ClientError.General.ForbiddenOnFollower", "oh no!" ) );
+                .thenThrow( new ClientException( "Neo.ClientError.Cluster.NotALeader", "oh no!" ) );
         ClusteredStatementResult result =
                 new ClusteredStatementResult( delegate, LOCALHOST, onError );
 

driver/src/test/resources/not_able_to_write_server.script

@@ -5,7 +5,7 @@
 
 C: RUN "CREATE ()" {}
 C: PULL_ALL
-S: FAILURE {"code": "Neo.ClientError.General.ForbiddenOnFollower", "message": "blabla"}
+S: FAILURE {"code": "Neo.ClientError.Cluster.NotALeader", "message": "blabla"}
 S: IGNORED
 C: ACK_FAILURE
 S: SUCCESS {}