Add support for BackendError to backend responses

Author: injectives

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

@@ -23,8 +23,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import neo4j.org.testkit.backend.messages.TestkitModule;
 import neo4j.org.testkit.backend.messages.requests.TestkitRequest;
+import neo4j.org.testkit.backend.messages.responses.BackendError;
 import neo4j.org.testkit.backend.messages.responses.DriverError;
-import neo4j.org.testkit.backend.messages.responses.TestkitErrorResponse;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
 
 import java.io.BufferedReader;
@@ -154,7 +154,7 @@ else if ( currentLine.equals( "#request end" ) )
                         // Unknown error, interpret this as a backend error.
                         // Report to frontend and rethrow, note that if socket been
                         // closed the writing will throw itself...
-                        writeResponse( TestkitErrorResponse.builder().errorMessage( e.toString() ).build() );
+                        writeResponse( BackendError.builder().data( BackendError.BackendErrorBody.builder().msg( e.toString() ).build() ).build() );
                         // This won't print if there was an IO exception since line above will rethrow
                         e.printStackTrace();
                         throw e;

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

@@ -23,10 +23,10 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
+import neo4j.org.testkit.backend.messages.responses.BackendError;
 import neo4j.org.testkit.backend.messages.responses.DomainNameResolutionRequired;
 import neo4j.org.testkit.backend.messages.responses.Driver;
 import neo4j.org.testkit.backend.messages.responses.ResolverResolutionRequired;
-import neo4j.org.testkit.backend.messages.responses.TestkitErrorResponse;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
 
 import java.net.URI;
@@ -66,8 +66,11 @@ public TestkitResponse process( TestkitState testkitState )
                                           data.authorizationToken.getTokens().get( "realm" ) );
             break;
         default:
-            return TestkitErrorResponse.builder().errorMessage( "Auth scheme " + data.authorizationToken.getTokens().get( "scheme" ) + "not implemented" )
-                                       .build();
+            return BackendError.builder().data( BackendError.BackendErrorBody.builder()
+                                                                             .msg( "Auth scheme " + data.authorizationToken.getTokens().get( "scheme" ) +
+                                                                                   "not implemented" )
+                                                                             .build() )
+                               .build();
         }
 
         Config.ConfigBuilder configBuilder = Config.builder();

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitBackendErrorResponse.java renamed to testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/BackendError.java

@@ -25,11 +25,21 @@
 @Setter
 @Getter
 @Builder
-public class TestkitBackendErrorResponse implements TestkitResponse
+public class BackendError implements TestkitResponse
 {
+    private final BackendErrorBody data;
+
     @Override
     public String testkitName()
     {
         return "BackendError";
     }
+
+    @Setter
+    @Getter
+    @Builder
+    public static class BackendErrorBody
+    {
+        private String msg;
+    }
 }