4.2 teskit cherry pick

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

@@ -0,0 +1,43 @@
+/*
+ * 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.requests;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import neo4j.org.testkit.backend.TestkitState;
+import neo4j.org.testkit.backend.messages.responses.FeatureList;
+import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Setter
+@Getter
+@NoArgsConstructor
+public class GetFeatures implements TestkitRequest
+{
+    private static final Set<String> FEATURES = new HashSet<>();
+
+    @Override
+    public TestkitResponse process( TestkitState testkitState )
+    {
+        return FeatureList.builder().data( FeatureList.FeatureListBody.builder().features( FEATURES ).build() ).build();
+    }
+}

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

@@ -34,7 +34,8 @@
         @JsonSubTypes.Type( SessionBeginTransaction.class ), @JsonSubTypes.Type( TransactionCommit.class ),
         @JsonSubTypes.Type( SessionLastBookmarks.class ), @JsonSubTypes.Type( SessionWriteTransaction.class ),
         @JsonSubTypes.Type( ResolverResolutionCompleted.class ), @JsonSubTypes.Type( CheckMultiDBSupport.class ),
-        @JsonSubTypes.Type( DomainNameResolutionCompleted.class ), @JsonSubTypes.Type( StartTest.class )
+        @JsonSubTypes.Type( DomainNameResolutionCompleted.class ), @JsonSubTypes.Type( StartTest.class ),
+        @JsonSubTypes.Type( TransactionRollback.class ), @JsonSubTypes.Type( GetFeatures.class )
 } )
 public interface TestkitRequest
 {

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

@@ -0,0 +1,61 @@
+/*
+ * 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.requests;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import neo4j.org.testkit.backend.TestkitState;
+import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
+import neo4j.org.testkit.backend.messages.responses.Transaction;
+
+import java.util.Optional;
+
+@Getter
+@NoArgsConstructor
+@Setter
+public class TransactionRollback implements TestkitRequest
+{
+    private TransactionRollbackBody data;
+
+    @Override
+    public TestkitResponse process( TestkitState testkitState )
+    {
+        return Optional.ofNullable( testkitState.getTransactions().get( data.txId ) )
+                       .map( tx ->
+                             {
+                                 tx.rollback();
+                                 return transaction( data.txId );
+                             } )
+                       .orElseThrow( () -> new RuntimeException( "Could not find transaction" ) );
+    }
+
+    private Transaction transaction( String txId )
+    {
+        return Transaction.builder().data( Transaction.TransactionBody.builder().id( txId ).build() ).build();
+    }
+
+    @Getter
+    @NoArgsConstructor
+    @Setter
+    public static class TransactionRollbackBody
+    {
+        private String txId;
+    }
+}

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

@@ -32,10 +32,12 @@
 
 public class TestkitListDeserializer extends StdDeserializer<List<?>>
 {
+    private final TestkitCypherParamDeserializer mapDeserializer;
 
     public TestkitListDeserializer()
     {
         super( List.class );
+        mapDeserializer = new TestkitCypherParamDeserializer();
     }
 
     @Override
@@ -88,14 +90,17 @@ public List<?> deserialize( JsonParser p, DeserializationContext ctxt ) throws I
                     }
                     else
                     {
-                        result.add( p.readValueAs( mapValueType ) );
+                        if ( paramType.equals( "CypherMap" ) ) // special recursive case for maps
+                        {
+                            result.add( mapDeserializer.deserialize( p, ctxt ) );
+                        } else {
+                            result.add( p.readValueAs( mapValueType ) );
+                        }
                     }
                 }
             }
             nextToken = p.nextToken();
         }
-        p.nextToken();
-        p.nextToken();
         return result;
     }
 }

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

@@ -0,0 +1,47 @@
+/*
+ * 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;
+import lombok.Setter;
+
+import java.util.Set;
+
+@Setter
+@Getter
+@Builder
+public class FeatureList implements TestkitResponse
+{
+    private final FeatureListBody data;
+
+    @Override
+    public String testkitName()
+    {
+        return "FeatureList";
+    }
+
+    @Setter
+    @Getter
+    @Builder
+    public static class FeatureListBody
+    {
+        private final Set<String> features;
+    }
+}