Properly handle TestKit's FrontendError

Author: robsdedude

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package neo4j.org.testkit.backend;
+
+public class FrontendError extends RuntimeException
+{
+}

testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitRequestProcessorHandler.java

@@ -22,6 +22,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import neo4j.org.testkit.backend.CustomDriverError;
+import neo4j.org.testkit.backend.FrontendError;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.requests.TestkitRequest;
 import neo4j.org.testkit.backend.messages.responses.BackendError;
@@ -160,6 +161,10 @@ else if ( throwable instanceof CustomDriverError )
                               )
                               .build();
         }
+        else if ( throwable instanceof FrontendError )
+        {
+            return neo4j.org.testkit.backend.messages.responses.FrontendError.builder().build();
+        }
         else
         {
             return BackendError.builder().data( BackendError.BackendErrorBody.builder().msg( throwable.toString() ).build() ).build();

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

@@ -20,6 +20,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import neo4j.org.testkit.backend.FrontendError;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.holder.SessionHolder;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
@@ -44,7 +45,7 @@ public TestkitResponse process( TestkitState testkitState )
         }
         else
         {
-            throwable = new RuntimeException( "Error from client in retryable tx" );
+            throwable = new FrontendError();
         }
         sessionHolder.getTxWorkFuture().completeExceptionally( throwable );
         return null;
@@ -64,7 +65,7 @@ public CompletionStage<TestkitResponse> processAsync( TestkitState testkitState
                                        }
                                        else
                                        {
-                                           throwable = new RuntimeException( "Error from client in retryable tx" );
+                                           throwable = new FrontendError();
                                        }
                                        sessionHolder.getTxWorkFuture().completeExceptionally( throwable );
                                        return null;
@@ -85,7 +86,7 @@ public Mono<TestkitResponse> processRx( TestkitState testkitState )
                                        }
                                        else
                                        {
-                                           throwable = new RuntimeException( "Error from client in retryable tx" );
+                                           throwable = new FrontendError();
                                        }
                                        sessionHolder.getTxWorkFuture().completeExceptionally( throwable );
                                        return null;

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/FrontendError.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package neo4j.org.testkit.backend.messages.responses;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class FrontendError implements TestkitResponse
+{
+    private final FrontendErrorBody data = new FrontendErrorBody("Imagine client code that throws...");
+
+    @Override
+    public String testkitName()
+    {
+        return "FrontendError";
+    }
+
+    @Getter
+    @Builder
+    public static class FrontendErrorBody
+    {
+        private String msg;
+    }
+}