Change the error code back to Request.Invalid after code review

neo4j · Jun 23, 2016 · eae5394 · eae5394
1 parent 76340e3
commit eae5394
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/SessionStateMachine.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/SessionStateMachine.java
@@ -105,7 +105,7 @@ public State interrupt( SessionStateMachine ctx )
                     @Override
                     protected State onNoImplementation( SessionStateMachine ctx, String command )
                     {
-                        ctx.error( new Neo4jError( Status.Security.Forbidden, "No operations allowed until you send an " +
+                        ctx.error( new Neo4jError( Status.Request.Invalid, "No operations allowed until you send an " +
                                 "INIT message successfully." ) );
                         return halt( ctx );
                     }

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionAuthIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionAuthIT.java
@@ -81,7 +81,7 @@ public void shouldDisallowRunOnAuthenticationFailureAndAck() throws Throwable
         assertThat( recorder, recorded(
                 failedWith(Status.Security.Unauthorized),
                 success(),
-                failedWith(Status.Security.Forbidden) ));
+                failedWith(Status.Request.Invalid) ));
     }
 
     @Test
@@ -105,11 +105,11 @@ public void shouldDisallowRunAfterAuthFailureAndReset() throws Throwable
         assertThat( recorder, recorded(
                 failedWith(Status.Security.Unauthorized),
                 success(),
-                failedWith(Status.Security.Forbidden) ));
+                failedWith(Status.Request.Invalid) ));
     }
 
     @Test
-    public void shouldIgnoreAfterSecurityForbidden() throws Throwable
+    public void shouldIgnoreAfterRequestInvalid() throws Throwable
     {
         // given it is important for client applications to programmatically
         // identify expired credentials as the cause of not being authenticated
@@ -122,7 +122,7 @@ public void shouldIgnoreAfterSecurityForbidden() throws Throwable
 
         // then
         assertThat( recorder, recorded(
-                failedWith(Status.Security.Forbidden),
+                failedWith(Status.Request.Invalid),
                 ignored() ));
     }
 
@@ -140,7 +140,7 @@ public void shouldDisallowRunBeforeSuccessInit() throws Throwable
         session.run( "RETURN 1337", map(), null, recorder );
 
         // then
-        assertThat( recorder, recorded( failedWith(Status.Security.Forbidden), ignored() ));
+        assertThat( recorder, recorded( failedWith(Status.Request.Invalid), ignored() ));
     }
 
     @Test
@@ -156,7 +156,7 @@ public void shouldDisallowResetBeforeSuccessInit() throws Throwable
         session.run( "RETURN 1337", map(), null, recorder );
 
         // then
-        assertThat( recorder, recorded( failedWith( Status.Security.Forbidden ), ignored() ));
+        assertThat( recorder, recorded( failedWith( Status.Request.Invalid ), ignored() ));
     }
 
     @Test

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/internal/StateMachineErrorTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/internal/StateMachineErrorTest.java
@@ -228,7 +228,7 @@ public void actionsDisallowedBeforeInitialized() throws Throwable
         machine.run( "RETURN 1", null, null, messages );
 
         // Then
-        assertThat( messages.next(), failedWith( Status.Security.Forbidden ) );
+        assertThat( messages.next(), failedWith( Status.Request.Invalid ) );
         assertThat( machine.state(), equalTo( SessionStateMachine.State.STOPPED ) );
     }
 }