wip (request refactoring)

Author: injectives

testkit-backend/src/main/java/neo4j/org/testkit/backend/AsyncSessionState.java

@@ -30,14 +30,10 @@
 public class AsyncSessionState
 {
     public AsyncSession session;
-    public int retryableState;
-    public String retryableErrorId;
-    public CompletableFuture<Void> result;
+    public CompletableFuture<Void> txWorkFuture;
 
     public AsyncSessionState( AsyncSession session )
     {
         this.session = session;
-        this.retryableState = 0;
-        this.retryableErrorId = "";
     }
 }

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryableNegative.java

@@ -55,15 +55,15 @@ public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState tes
     {
         AsyncSessionState sessionState = testkitState.getAsyncSessionStates().get( data.getSessionId() );
         Throwable throwable;
-        if ( !"".equals( data.errorId ) )
+        if ( !"".equals( data.getErrorId() ) )
         {
-            throwable = testkitState.getErrors().get( data.errorId );
+            throwable = testkitState.getErrors().get( data.getErrorId() );
         }
         else
         {
             throwable = new RuntimeException( "Error from client in retryable tx" );
         }
-        sessionState.getResult().completeExceptionally( throwable );
+        sessionState.getTxWorkFuture().completeExceptionally( throwable );
         return CompletableFuture.completedFuture( Optional.empty() );
     }
 

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryablePositive.java

@@ -21,7 +21,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import neo4j.org.testkit.backend.AsyncSessionState;
 import neo4j.org.testkit.backend.SessionState;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
@@ -52,11 +51,7 @@ public TestkitResponse process( TestkitState testkitState )
     @Override
     public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState testkitState )
     {
-        AsyncSessionState sessionState = testkitState.getAsyncSessionStates().get( data.getSessionId() );
-        if ( sessionState != null )
-        {
-            sessionState.getResult().complete( null );
-        }
+        testkitState.getAsyncSessionStates().get( data.getSessionId() ).getTxWorkFuture().complete( null );
         return CompletableFuture.completedFuture( Optional.empty() );
     }
 

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java

@@ -67,9 +67,9 @@ public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState tes
             String txId = testkitState.newId();
             testkitState.getAsyncTransactions().put( txId, tx );
             testkitState.getResponseWriter().accept( retryableTry( txId ) );
-            CompletableFuture<Void> tryResult = new CompletableFuture<>();
-            sessionState.setResult( tryResult );
-            return tryResult;
+            CompletableFuture<Void> txWorkFuture = new CompletableFuture<>();
+            sessionState.setTxWorkFuture( txWorkFuture );
+            return txWorkFuture;
         };
 
         return session.readTransactionAsync( workWrapper )

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java

@@ -70,7 +70,7 @@ public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState tes
                     testkitState.getAsyncTransactions().put( txId, tx );
                     testkitState.getResponseWriter().accept( retryableTry( txId ) );
                     CompletableFuture<Void> tryResult = new CompletableFuture<>();
-                    sessionState.setResult( tryResult );
+                    sessionState.setTxWorkFuture( tryResult );
                     return tryResult;
                 };