Adressing pull request comments, but not about the usage of 0.0.0.0 on the ServerSocket and delomboking

bigmontz · bigmontz · commit d48ff7c6971b · 2020-10-30T11:43:53.000+01:00
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/Runner.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/Runner.java
@@ -1,4 +1,4 @@
-package neo4j.org.testkit.backend;/*
+/*
  * Copyright (c) 2002-2020 "Neo4j,"
  * Neo4j Sweden AB [http://neo4j.com]
  *
@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package neo4j.org.testkit.backend;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryablePositive.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryablePositive.java
@@ -35,7 +35,7 @@ public class RetryablePositive implements TestkitRequest
     @Override
     public TestkitResponse process( TestkitState testkitState )
     {
-        SessionState sessionState = testkitState.getSessionStates().getOrDefault( data.sessionId, null );
+        SessionState sessionState = testkitState.getSessionStates().get( data.sessionId );
         if ( sessionState == null )
         {
             throw new RuntimeException( "Could not find session" );
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java
@@ -21,6 +21,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import neo4j.org.testkit.backend.SessionState;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.RetryableDone;
 import neo4j.org.testkit.backend.messages.responses.RetryableTry;
@@ -29,6 +30,7 @@
 import java.util.Optional;
 
 import org.neo4j.driver.Session;
+import org.neo4j.driver.TransactionWork;
 
 @Setter
 @Getter
@@ -44,45 +46,50 @@ public TestkitResponse process( TestkitState testkitState )
                        .map( sessionState ->
                              {
                                  Session session = sessionState.getSession();
-                                 session.readTransaction( tx ->
-                                                          {
-                                                              System.out.println( "Start" );
-                                                              sessionState.setRetryableState( 0 );
-                                                              String txId = testkitState.newId();
-                                                              testkitState.getTransactions().put( txId, tx );
-                                                              testkitState.getResponseWriter().accept( retryableTry( txId ) );
-
-                                                              while ( true )
-                                                              {
-                                                                  // Process commands as usual but blocking in here
-                                                                  testkitState.getProcessor().get();
-
-                                                                  // Check if state changed on session
-                                                                  switch ( sessionState.retryableState )
-                                                                  {
-                                                                  case 0:
-                                                                      // Nothing happened to session state while processing command
-                                                                      break;
-                                                                  case 1:
-                                                                      // Client is happy to commit
-                                                                      return 0;
-                                                                  case -1:
-                                                                      // Client wants to rollback
-                                                                      if ( !"".equals( sessionState.retryableErrorId ) )
-                                                                      {
-                                                                          throw testkitState.getErrors().get( sessionState.retryableErrorId );
-                                                                      }
-                                                                      else
-                                                                      {
-                                                                          throw new RuntimeException( "Error from client in retryable tx" );
-                                                                      }
-                                                                  }
-                                                              }
-                                                          } );
+                                 session.readTransaction( handle( testkitState, sessionState ) );
                                  return retryableDone();
                              } ).orElseThrow( () -> new RuntimeException( "Could not find session" ) );
     }
 
+    private TransactionWork<Integer> handle( TestkitState testkitState, SessionState sessionState )
+    {
+        return tx ->
+        {
+            System.out.println( "Start" );
+            sessionState.setRetryableState( 0 );
+            String txId = testkitState.newId();
+            testkitState.getTransactions().put( txId, tx );
+            testkitState.getResponseWriter().accept( retryableTry( txId ) );
+
+            while ( true )
+            {
+                // Process commands as usual but blocking in here
+                testkitState.getProcessor().get();
+
+                // Check if state changed on session
+                switch ( sessionState.retryableState )
+                {
+                case 0:
+                    // Nothing happened to session state while processing command
+                    break;
+                case 1:
+                    // Client is happy to commit
+                    return 0;
+                case -1:
+                    // Client wants to rollback
+                    if ( !"".equals( sessionState.retryableErrorId ) )
+                    {
+                        throw testkitState.getErrors().get( sessionState.retryableErrorId );
+                    }
+                    else
+                    {
+                        throw new RuntimeException( "Error from client in retryable tx" );
+                    }
+                }
+            }
+        };
+    }
+
     private RetryableTry retryableTry( String txId )
     {
         return RetryableTry.builder().data( RetryableTry.RetryableTryBody.builder().id( txId ).build() ).build();
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionCommit.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionCommit.java
@@ -37,7 +37,7 @@ public class TransactionCommit implements TestkitRequest
     @Override
     public TestkitResponse process( TestkitState testkitState )
     {
-        return Optional.ofNullable( testkitState.getTransactions().getOrDefault( data.txId, null ) )
+        return Optional.ofNullable( testkitState.getTransactions().get( data.txId ) )
                        .map( tx ->
                              {
                                  tx.commit();
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRun.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRun.java
@@ -37,7 +37,7 @@ public class TransactionRun implements TestkitRequest
     @Override
     public TestkitResponse process( TestkitState testkitState )
     {
-        return Optional.ofNullable( testkitState.getTransactions().getOrDefault( data.txId, null ) )
+        return Optional.ofNullable( testkitState.getTransactions().get( data.txId ) )
                        .map( tx -> tx.run( data.cypher ) )
                        .map( result ->
                              {
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NullRecord.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NullRecord.java
@@ -27,8 +27,6 @@
 @Builder
 public class NullRecord implements TestkitResponse
 {
-    private Object data = null;
-
     @Override
     public String testkitName()
     {
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableDone.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableDone.java
@@ -27,8 +27,6 @@
 @Builder
 public class RetryableDone implements TestkitResponse
 {
-    private final Object data = null;
-
     @Override
     public String testkitName()
     {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class RetryablePositive implements TestkitRequest`
`35`	`35`	`@Override`
`36`	`36`	`public TestkitResponse process( TestkitState testkitState )`
`37`	`37`	`{`
`38`		`- SessionState sessionState = testkitState.getSessionStates().getOrDefault( data.sessionId, null );`
	`38`	`+ SessionState sessionState = testkitState.getSessionStates().get( data.sessionId );`
`39`	`39`	`if ( sessionState == null )`
`40`	`40`	`{`
`41`	`41`	`throw new RuntimeException( "Could not find session" );`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class TransactionCommit implements TestkitRequest`
`37`	`37`	`@Override`
`38`	`38`	`public TestkitResponse process( TestkitState testkitState )`
`39`	`39`	`{`
`40`		`- return Optional.ofNullable( testkitState.getTransactions().getOrDefault( data.txId, null ) )`
	`40`	`+ return Optional.ofNullable( testkitState.getTransactions().get( data.txId ) )`
`41`	`41`	`.map( tx ->`
`42`	`42`	`{`
`43`	`43`	`tx.commit();`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@`
`27`	`27`	`@Builder`
`28`	`28`	`public class NullRecord implements TestkitResponse`
`29`	`29`	`{`
`30`		`- private Object data = null;`
`31`		`-`
`32`	`30`	`@Override`
`33`	`31`	`public String testkitName()`
`34`	`32`	`{`