diff --git a/examples/src/main/java/org/neo4j/docs/driver/AsyncTransactionFunctionExample.java b/examples/src/main/java/org/neo4j/docs/driver/AsyncTransactionFunctionExample.java index c21995a50e..77c5fe0352 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/AsyncTransactionFunctionExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/AsyncTransactionFunctionExample.java @@ -32,10 +32,10 @@ public AsyncTransactionFunctionExample(String uri, String user, String password) // tag::async-transaction-function[] public CompletionStage printAllProducts() { - String query = "MATCH (p:Product) WHERE p.id = $id RETURN p.title"; + var query = "MATCH (p:Product) WHERE p.id = $id RETURN p.title"; Map parameters = Collections.singletonMap("id", 0); - AsyncSession session = driver.session(AsyncSession.class); + var session = driver.session(AsyncSession.class); return session.executeReadAsync(tx -> tx.runAsync(query, parameters) .thenCompose(cursor -> cursor.forEachAsync(record -> diff --git a/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java b/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java index cd6bfeca59..941d6eaef0 100644 --- a/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java +++ b/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java @@ -71,7 +71,7 @@ private int readInt(String database, final String query, final Value parameters) } else { sessionConfig = SessionConfig.forDatabase(database); } - try (Session session = neo4j.driver().session(sessionConfig)) { + try (var session = neo4j.driver().session(sessionConfig)) { return session.executeRead( tx -> tx.run(query, parameters).single().get(0).asInt()); } @@ -86,7 +86,7 @@ private int readInt(final String query) { } private void write(final String query, final Value parameters) { - try (Session session = neo4j.driver().session()) { + try (var session = neo4j.driver().session()) { session.executeWriteWithoutResult(tx -> tx.run(query, parameters).consume()); } } @@ -112,7 +112,7 @@ void setUp() { @Test void testShouldRunAutocommitTransactionExample() { // Given - try (AutocommitTransactionExample example = + try (var example = new AutocommitTransactionExample(uri, USER, neo4j.adminPassword())) { // When example.addPerson("Alice"); @@ -124,16 +124,16 @@ void testShouldRunAutocommitTransactionExample() { @Test void testShouldRunAsyncAutocommitTransactionExample() { - try (AsyncAutocommitTransactionExample example = + try (var example = new AsyncAutocommitTransactionExample(uri, USER, neo4j.adminPassword())) { // create some 'Product' nodes - try (Session session = neo4j.driver().session()) { + try (var session = neo4j.driver().session()) { session.run("UNWIND ['Tesseract', 'Orb', 'Eye of Agamotto'] AS item " + "CREATE (:Product {id: 0, title: item})"); } // read all 'Product' nodes - List titles = await(example.readProductTitles()); + var titles = await(example.readProductTitles()); assertEquals(new HashSet<>(asList("Tesseract", "Orb", "Eye of Agamotto")), new HashSet<>(titles)); } } @@ -143,9 +143,9 @@ void testShouldAsyncRunResultConsumeExample() { // Given write("CREATE (a:Person {name: 'Alice'})"); write("CREATE (a:Person {name: 'Bob'})"); - try (AsyncResultConsumeExample example = new AsyncResultConsumeExample(uri, USER, neo4j.adminPassword())) { + try (var example = new AsyncResultConsumeExample(uri, USER, neo4j.adminPassword())) { // When - List names = await(example.getPeople()); + var names = await(example.getPeople()); // Then assertThat(names, equalTo(asList("Alice", "Bob"))); @@ -157,13 +157,13 @@ void testShouldAsyncRunMultipleTransactionExample() { // Given write("CREATE (a:Person {name: 'Alice'})"); write("CREATE (a:Person {name: 'Bob'})"); - try (AsyncRunMultipleTransactionExample example = + try (var example = new AsyncRunMultipleTransactionExample(uri, USER, neo4j.adminPassword())) { // When - Integer nodesCreated = await(example.addEmployees("Acme")); + var nodesCreated = await(example.addEmployees("Acme")); // Then - int employeeCount = + var employeeCount = readInt("MATCH (emp:Person)-[WORKS_FOR]->(com:Company) WHERE com.name = 'Acme' RETURN count(emp)"); assertThat(employeeCount, equalTo(2)); assertThat(nodesCreated, equalTo(1)); @@ -173,7 +173,7 @@ void testShouldAsyncRunMultipleTransactionExample() { @Test void testShouldRunConfigConnectionPoolExample() { // Given - try (ConfigConnectionPoolExample example = new ConfigConnectionPoolExample(uri, USER, neo4j.adminPassword())) { + try (var example = new ConfigConnectionPoolExample(uri, USER, neo4j.adminPassword())) { // Then assertTrue(example.canConnect()); } @@ -182,7 +182,7 @@ void testShouldRunConfigConnectionPoolExample() { @Test void testShouldRunBasicAuthExample() { // Given - try (BasicAuthExample example = new BasicAuthExample(uri, USER, neo4j.adminPassword())) { + try (var example = new BasicAuthExample(uri, USER, neo4j.adminPassword())) { // Then assertTrue(example.canConnect()); } @@ -191,7 +191,7 @@ void testShouldRunBasicAuthExample() { @Test void testShouldRunConfigConnectionTimeoutExample() { // Given - try (ConfigConnectionTimeoutExample example = + try (var example = new ConfigConnectionTimeoutExample(uri, USER, neo4j.adminPassword())) { // Then assertThat(example, instanceOf(ConfigConnectionTimeoutExample.class)); @@ -201,7 +201,7 @@ void testShouldRunConfigConnectionTimeoutExample() { @Test void testShouldRunConfigMaxRetryTimeExample() { // Given - try (ConfigMaxRetryTimeExample example = new ConfigMaxRetryTimeExample(uri, USER, neo4j.adminPassword())) { + try (var example = new ConfigMaxRetryTimeExample(uri, USER, neo4j.adminPassword())) { // Then assertThat(example, instanceOf(ConfigMaxRetryTimeExample.class)); } @@ -210,7 +210,7 @@ void testShouldRunConfigMaxRetryTimeExample() { @Test void testShouldRunConfigTrustExample() { // Given - try (ConfigTrustExample example = new ConfigTrustExample(uri, USER, neo4j.adminPassword())) { + try (var example = new ConfigTrustExample(uri, USER, neo4j.adminPassword())) { // Then assertThat(example, instanceOf(ConfigTrustExample.class)); } @@ -219,7 +219,7 @@ void testShouldRunConfigTrustExample() { @Test void testShouldRunConfigUnencryptedExample() { // Given - try (ConfigUnencryptedExample example = new ConfigUnencryptedExample(uri, USER, neo4j.adminPassword())) { + try (var example = new ConfigUnencryptedExample(uri, USER, neo4j.adminPassword())) { // Then assertThat(example, instanceOf(ConfigUnencryptedExample.class)); } @@ -228,7 +228,7 @@ void testShouldRunConfigUnencryptedExample() { @Test void testShouldRunDriverLifecycleExample() { // Given - try (DriverLifecycleExample example = new DriverLifecycleExample(uri, USER, neo4j.adminPassword())) { + try (var example = new DriverLifecycleExample(uri, USER, neo4j.adminPassword())) { // Then assertThat(example, instanceOf(DriverLifecycleExample.class)); } @@ -237,9 +237,9 @@ void testShouldRunDriverLifecycleExample() { @Test void testShouldRunHelloWorld() throws Exception { // Given - try (HelloWorldExample greeter = new HelloWorldExample(uri, USER, neo4j.adminPassword())) { + try (var greeter = new HelloWorldExample(uri, USER, neo4j.adminPassword())) { // When - StdIOCapture stdIO = StdIOCapture.capture(); + var stdIO = StdIOCapture.capture(); try (stdIO) { greeter.printGreeting("hello, world"); @@ -254,9 +254,9 @@ void testShouldRunHelloWorld() throws Exception { @Test void testShouldRunReadWriteTransactionExample() { // Given - try (ReadWriteTransactionExample example = new ReadWriteTransactionExample(uri, USER, neo4j.adminPassword())) { + try (var example = new ReadWriteTransactionExample(uri, USER, neo4j.adminPassword())) { // When - long nodeID = example.addPerson("Alice"); + var nodeID = example.addPerson("Alice"); // Then assertThat(nodeID, greaterThanOrEqualTo(0L)); @@ -268,9 +268,9 @@ void testShouldRunResultConsumeExample() { // Given write("CREATE (a:Person {name: 'Alice'})"); write("CREATE (a:Person {name: 'Bob'})"); - try (ResultConsumeExample example = new ResultConsumeExample(uri, USER, neo4j.adminPassword())) { + try (var example = new ResultConsumeExample(uri, USER, neo4j.adminPassword())) { // When - List names = example.getPeople(); + var names = example.getPeople(); // Then assertThat(names, equalTo(asList("Alice", "Bob"))); @@ -282,12 +282,12 @@ void testShouldRunResultRetainExample() { // Given write("CREATE (a:Person {name: 'Alice'})"); write("CREATE (a:Person {name: 'Bob'})"); - try (ResultRetainExample example = new ResultRetainExample(uri, USER, neo4j.adminPassword())) { + try (var example = new ResultRetainExample(uri, USER, neo4j.adminPassword())) { // When example.addEmployees("Acme"); // Then - int employeeCount = + var employeeCount = readInt("MATCH (emp:Person)-[WORKS_FOR]->(com:Company) WHERE com.name = 'Acme' RETURN count(emp)"); assertThat(employeeCount, equalTo(2)); } @@ -296,7 +296,7 @@ void testShouldRunResultRetainExample() { @Test void testShouldRunTransactionFunctionExample() { // Given - try (TransactionFunctionExample example = new TransactionFunctionExample(uri, USER, neo4j.adminPassword())) { + try (var example = new TransactionFunctionExample(uri, USER, neo4j.adminPassword())) { // When example.addPerson("Alice"); @@ -308,7 +308,7 @@ void testShouldRunTransactionFunctionExample() { @Test void testShouldConfigureTransactionTimeoutExample() { // Given - try (TransactionTimeoutConfigExample example = + try (var example = new TransactionTimeoutConfigExample(uri, USER, neo4j.adminPassword())) { // When example.addPerson("Alice"); @@ -321,7 +321,7 @@ void testShouldConfigureTransactionTimeoutExample() { @Test void testShouldConfigureTransactionMetadataExample() { // Given - try (TransactionMetadataConfigExample example = + try (var example = new TransactionMetadataConfigExample(uri, USER, neo4j.adminPassword())) { // When example.addPerson("Alice"); @@ -333,19 +333,19 @@ void testShouldConfigureTransactionMetadataExample() { @Test void testShouldRunAsyncTransactionFunctionExample() throws Exception { - try (AsyncTransactionFunctionExample example = + try (var example = new AsyncTransactionFunctionExample(uri, USER, neo4j.adminPassword())) { // create some 'Product' nodes - try (Session session = neo4j.driver().session()) { + try (var session = neo4j.driver().session()) { session.run( "UNWIND ['Infinity Gauntlet', 'Mjölnir'] AS item " + "CREATE (:Product {id: 0, title: item})"); } - StdIOCapture stdIOCapture = StdIOCapture.capture(); + var stdIOCapture = StdIOCapture.capture(); // print all 'Product' nodes to fake stdout try (stdIOCapture) { - ResultSummary summary = await(example.printAllProducts()); + var summary = await(example.printAllProducts()); assertEquals(QueryType.READ_ONLY, summary.queryType()); } @@ -356,7 +356,7 @@ void testShouldRunAsyncTransactionFunctionExample() throws Exception { @Test void testPassBookmarksExample() { - try (PassBookmarkExample example = new PassBookmarkExample(uri, USER, neo4j.adminPassword())) { + try (var example = new PassBookmarkExample(uri, USER, neo4j.adminPassword())) { // When example.addEmployAndMakeFriends(); @@ -366,15 +366,15 @@ void testPassBookmarksExample() { assertThat(personCount("Alice"), is(1)); assertThat(personCount("Bob"), is(1)); - int employeeCountOfWayne = readInt( + var employeeCountOfWayne = readInt( "MATCH (emp:Person)-[WORKS_FOR]->(com:Company) WHERE com.name = 'Wayne Enterprises' RETURN count(emp)"); assertThat(employeeCountOfWayne, is(1)); - int employeeCountOfLexCorp = readInt( + var employeeCountOfLexCorp = readInt( "MATCH (emp:Person)-[WORKS_FOR]->(com:Company) WHERE com.name = 'LexCorp' RETURN count(emp)"); assertThat(employeeCountOfLexCorp, is(1)); - int friendCount = + var friendCount = readInt("MATCH (a:Person {name: 'Alice'})-[:KNOWS]->(b:Person {name: 'Bob'}) RETURN count(a)"); assertThat(friendCount, is(1)); } @@ -383,16 +383,16 @@ void testPassBookmarksExample() { @Test @EnabledOnNeo4jWith(BOLT_V4) void testShouldRunRxAutocommitTransactionExample() { - try (RxAutocommitTransactionExample example = + try (var example = new RxAutocommitTransactionExample(uri, USER, neo4j.adminPassword())) { // create some 'Product' nodes - try (Session session = neo4j.driver().session()) { + try (var session = neo4j.driver().session()) { session.run("UNWIND ['Tesseract', 'Orb', 'Eye of Agamotto'] AS item " + "CREATE (:Product {id: 0, title: item})"); } // read all 'Product' nodes - List titles = await(example.readProductTitles()); + var titles = await(example.readProductTitles()); assertEquals(new HashSet<>(asList("Tesseract", "Orb", "Eye of Agamotto")), new HashSet<>(titles)); } } @@ -400,21 +400,21 @@ void testShouldRunRxAutocommitTransactionExample() { @Test @EnabledOnNeo4jWith(BOLT_V4) void testShouldRunRxTransactionFunctionExampleReactor() throws Exception { - try (RxTransactionFunctionExample example = + try (var example = new RxTransactionFunctionExample(uri, USER, neo4j.adminPassword())) { // create some 'Product' nodes - try (Session session = neo4j.driver().session()) { + try (var session = neo4j.driver().session()) { session.run( "UNWIND ['Infinity Gauntlet', 'Mjölnir'] AS item " + "CREATE (:Product {id: 0, title: item})"); } - StdIOCapture stdIOCapture = StdIOCapture.capture(); + var stdIOCapture = StdIOCapture.capture(); // print all 'Product' nodes to fake stdout try (stdIOCapture) { - final List summaryList = await(example.printAllProducts()); + final var summaryList = await(example.printAllProducts()); assertThat(summaryList.size(), equalTo(1)); - ResultSummary summary = summaryList.get(0); + var summary = summaryList.get(0); assertEquals(QueryType.READ_ONLY, summary.queryType()); } @@ -429,9 +429,9 @@ void testShouldRunRxResultConsumeExampleReactor() { // Given write("CREATE (a:Person {name: 'Alice'})"); write("CREATE (a:Person {name: 'Bob'})"); - try (RxResultConsumeExample example = new RxResultConsumeExample(uri, USER, neo4j.adminPassword())) { + try (var example = new RxResultConsumeExample(uri, USER, neo4j.adminPassword())) { // When - List names = await(example.getPeople()); + var names = await(example.getPeople()); // Then assertThat(names, equalTo(asList("Alice", "Bob"))); @@ -441,16 +441,16 @@ void testShouldRunRxResultConsumeExampleReactor() { @Test @EnabledOnNeo4jWith(value = BOLT_V4, edition = ENTERPRISE) void testUseAnotherDatabaseExample() { - Driver driver = neo4j.driver(); + var driver = neo4j.driver(); dropDatabase(driver, "examples"); createDatabase(driver, "examples"); - try (DatabaseSelectionExample example = new DatabaseSelectionExample(uri, USER, neo4j.adminPassword())) { + try (var example = new DatabaseSelectionExample(uri, USER, neo4j.adminPassword())) { // When example.useAnotherDatabaseExample(); // Then - int greetingCount = readInt("examples", "MATCH (a:Greeting) RETURN count(a)", Values.parameters()); + var greetingCount = readInt("examples", "MATCH (a:Greeting) RETURN count(a)", Values.parameters()); assertThat(greetingCount, is(1)); } } diff --git a/examples/src/test/java/org/neo4j/docs/driver/RoutingExamplesIT.java b/examples/src/test/java/org/neo4j/docs/driver/RoutingExamplesIT.java index bfbbeb39eb..7ecd82e59d 100644 --- a/examples/src/test/java/org/neo4j/docs/driver/RoutingExamplesIT.java +++ b/examples/src/test/java/org/neo4j/docs/driver/RoutingExamplesIT.java @@ -44,9 +44,9 @@ class RoutingExamplesIT { @Test void testShouldRunConfigCustomResolverExample() { // Given - URI boltUri = URI.create(NEO4J_CONTAINER.getBoltUrl()); - String neo4jUrl = String.format("neo4j://%s:%d", boltUri.getHost(), boltUri.getPort()); - try (ConfigCustomResolverExample example = new ConfigCustomResolverExample( + var boltUri = URI.create(NEO4J_CONTAINER.getBoltUrl()); + var neo4jUrl = String.format("neo4j://%s:%d", boltUri.getHost(), boltUri.getPort()); + try (var example = new ConfigCustomResolverExample( neo4jUrl, AuthTokens.none(), ServerAddress.of(boltUri.getHost(), boltUri.getPort()))) { // Then assertTrue(example.canConnect()); 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 index f4c2956a00..c983c19cfe 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/Runner.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/Runner.java @@ -19,7 +19,6 @@ package neo4j.org.testkit.backend; import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; @@ -35,7 +34,7 @@ public class Runner { public static void main(String[] args) throws InterruptedException { TestkitRequestProcessorHandler.BackendMode backendMode; - String modeArg = args.length > 0 ? args[0] : null; + var modeArg = args.length > 0 ? args[0] : null; if ("async".equals(modeArg)) { backendMode = TestkitRequestProcessorHandler.BackendMode.ASYNC; } else if ("reactive-legacy".equals(modeArg)) { @@ -54,7 +53,7 @@ public static void main(String[] args) throws InterruptedException { EventLoopGroup group = new NioEventLoopGroup(); try { - ServerBootstrap bootstrap = new ServerBootstrap(); + var bootstrap = new ServerBootstrap(); bootstrap .group(group) .channel(NioServerSocketChannel.class) @@ -68,7 +67,7 @@ protected void initChannel(SocketChannel channel) { channel.pipeline().addLast(new TestkitRequestProcessorHandler(backendMode, logging)); } }); - ChannelFuture server = bootstrap.bind().sync(); + var server = bootstrap.bind().sync(); server.channel().closeFuture().sync(); } finally { group.shutdownGracefully().sync(); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/RxBufferedSubscriber.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/RxBufferedSubscriber.java index 436016690d..6ff8c7ce4e 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/RxBufferedSubscriber.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/RxBufferedSubscriber.java @@ -52,7 +52,7 @@ public class RxBufferedSubscriber extends BaseSubscriber { public RxBufferedSubscriber(long fetchSize) { this.fetchSize = fetchSize; - AtomicReference> sinkRef = new AtomicReference<>(); + var sinkRef = new AtomicReference>(); itemsSubscriber = new OneSignalSubscriber<>(); Flux.create(fluxSink -> { sinkRef.set(fluxSink); @@ -121,7 +121,7 @@ private void requestFromUpstream() { if (moreItemsPending) { return; } - Subscription subscription = subscriptionFuture.getNow(null); + var subscription = subscriptionFuture.getNow(null); if (subscription == null) { throw new IllegalStateException("Upstream subscription must not be null at this stage"); } @@ -169,7 +169,7 @@ protected void hookOnSubscribe(Subscription subscription) { @Override protected void hookOnNext(T value) { - MonoSink sink = executeWithLock(lock, () -> { + var sink = executeWithLock(lock, () -> { emitted = true; return this.sink; }); @@ -178,7 +178,7 @@ protected void hookOnNext(T value) { @Override protected void hookOnComplete() { - MonoSink sink = executeWithLock(lock, () -> { + var sink = executeWithLock(lock, () -> { completionFuture.complete(null); return !emitted ? this.sink : null; }); @@ -189,7 +189,7 @@ protected void hookOnComplete() { @Override protected void hookOnError(Throwable throwable) { - MonoSink sink = executeWithLock(lock, () -> { + var sink = executeWithLock(lock, () -> { completionFuture.completeExceptionally(throwable); return !emitted ? this.sink : null; }); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/TestkitState.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/TestkitState.java index 9590ee5e59..947b6d3ae3 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/TestkitState.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/TestkitState.java @@ -263,13 +263,13 @@ public void removeAuthProvider(String id) { } private String add(T value, Map idToT) { - String id = newId(); + var id = newId(); idToT.put(id, value); return id; } private T get(String id, Map idToT, String notFoundMessage) { - T value = idToT.get(id); + var value = idToT.get(id); if (value == null) { throw new RuntimeException(notFoundMessage); } @@ -277,8 +277,8 @@ private T get(String id, Map idToT, String notFoundMessage) { } private CompletableFuture getAsync(String id, Map idToT, String notFoundMessage) { - CompletableFuture result = new CompletableFuture<>(); - T value = idToT.get(id); + var result = new CompletableFuture(); + var value = idToT.get(id); if (value == null) { result.completeExceptionally(new RuntimeException(notFoundMessage)); } else { diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitMessageInboundHandler.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitMessageInboundHandler.java index 52d5f937c0..f2abde59f4 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitMessageInboundHandler.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitMessageInboundHandler.java @@ -31,11 +31,11 @@ public class TestkitMessageInboundHandler extends SimpleChannelInboundHandler testkitMessages = new ArrayList<>(); - Optional testkitMessageOpt = extractTestkitMessage(); + var testkitMessageOpt = extractTestkitMessage(); while (testkitMessageOpt.isPresent()) { testkitMessages.add(testkitMessageOpt.get()); testkitMessageOpt = extractTestkitMessage(); @@ -45,18 +45,18 @@ public void channelRead0(ChannelHandlerContext ctx, ByteBuf byteBuf) { } private Optional extractTestkitMessage() { - String requestEndMarker = "#request end\n"; - int endMarkerIndex = requestBuffer.indexOf(requestEndMarker); + var requestEndMarker = "#request end\n"; + var endMarkerIndex = requestBuffer.indexOf(requestEndMarker); if (endMarkerIndex < 0) { return Optional.empty(); } - String requestBeginMarker = "#request begin\n"; - int beginMarkerIndex = requestBuffer.indexOf(requestBeginMarker); + var requestBeginMarker = "#request begin\n"; + var beginMarkerIndex = requestBuffer.indexOf(requestBeginMarker); if (beginMarkerIndex != 0) { throw new RuntimeException("Unexpected data in message buffer"); } // extract Testkit message without markers - String testkitMessage = requestBuffer.substring(requestBeginMarker.length(), endMarkerIndex); + var testkitMessage = requestBuffer.substring(requestBeginMarker.length(), endMarkerIndex); if (testkitMessage.contains(requestBeginMarker) || testkitMessage.contains(requestEndMarker)) { throw new RuntimeException("Testkit message contains request markers"); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitMessageOutboundHandler.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitMessageOutboundHandler.java index b5b7dfd4ab..bf70f9c8de 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitMessageOutboundHandler.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitMessageOutboundHandler.java @@ -18,7 +18,6 @@ */ package neo4j.org.testkit.backend.channel.handler; -import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; @@ -28,9 +27,9 @@ public class TestkitMessageOutboundHandler extends ChannelOutboundHandlerAdapter { @Override public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) { - String testkitResponseStr = (String) msg; - String testkitMessage = String.format("#response begin\n%s\n#response end\n", testkitResponseStr); - ByteBuf byteBuf = Unpooled.copiedBuffer(testkitMessage, StandardCharsets.UTF_8); + var testkitResponseStr = (String) msg; + var testkitMessage = String.format("#response begin\n%s\n#response end\n", testkitResponseStr); + var byteBuf = Unpooled.copiedBuffer(testkitMessage, StandardCharsets.UTF_8); ctx.writeAndFlush(byteBuf, promise); } } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitRequestProcessorHandler.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitRequestProcessorHandler.java index 824a6bd8f1..a3a3049ca2 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitRequestProcessorHandler.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitRequestProcessorHandler.java @@ -79,8 +79,8 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) { // resolvers support, is blocking. requestExecutorService.execute(() -> { try { - TestkitRequest request = (TestkitRequest) msg; - CompletionStage responseStage = processorImpl.apply(request, testkitState); + var request = (TestkitRequest) msg; + var responseStage = processorImpl.apply(request, testkitState); responseStage.whenComplete((response, throwable) -> { if (throwable != null) { ctx.writeAndFlush(createErrorResponse(throwable)); @@ -96,7 +96,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) { private static CompletionStage wrapSyncRequest( TestkitRequest testkitRequest, TestkitState testkitState) { - CompletableFuture result = new CompletableFuture<>(); + var result = new CompletableFuture(); try { result.complete(testkitRequest.process(testkitState)); } catch (Throwable t) { @@ -115,8 +115,8 @@ private TestkitResponse createErrorResponse(Throwable throwable) { throwable = throwable.getCause(); } if (throwable instanceof Neo4jException) { - String id = testkitState.newId(); - Neo4jException e = (Neo4jException) throwable; + var id = testkitState.newId(); + var e = (Neo4jException) throwable; testkitState.getErrors().put(id, e); return DriverError.builder() .data(DriverError.DriverErrorBody.builder() @@ -130,7 +130,7 @@ private TestkitResponse createErrorResponse(Throwable throwable) { || throwable instanceof UntrustedServerException || throwable instanceof NoSuchRecordException || throwable instanceof ZoneRulesException) { - String id = testkitState.newId(); + var id = testkitState.newId(); testkitState.getErrors().put(id, (Exception) throwable); return DriverError.builder() .data(DriverError.DriverErrorBody.builder() @@ -141,7 +141,7 @@ private TestkitResponse createErrorResponse(Throwable throwable) { .build(); } else if (throwable instanceof CustomDriverError) { throwable = throwable.getCause(); - String id = testkitState.newId(); + var id = testkitState.newId(); return DriverError.builder() .data(DriverError.DriverErrorBody.builder() .id(id) diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitRequestResponseMapperHandler.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitRequestResponseMapperHandler.java index f767cf0030..1ebd45b6a9 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitRequestResponseMapperHandler.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/channel/handler/TestkitRequestResponseMapperHandler.java @@ -39,7 +39,7 @@ public TestkitRequestResponseMapperHandler(Logging logging) { @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { - String testkitMessage = (String) msg; + var testkitMessage = (String) msg; log.debug("Inbound Testkit message '%s'", testkitMessage.trim()); TestkitRequest testkitRequest; testkitRequest = objectMapper.readValue(testkitMessage, TestkitRequest.class); @@ -48,15 +48,15 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception @Override public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { - TestkitResponse testkitResponse = (TestkitResponse) msg; - String responseStr = objectMapper.writeValueAsString(testkitResponse); + var testkitResponse = (TestkitResponse) msg; + var responseStr = objectMapper.writeValueAsString(testkitResponse); log.debug("Outbound Testkit message '%s'", responseStr.trim()); ctx.writeAndFlush(responseStr, promise); } public static ObjectMapper newObjectMapper() { - ObjectMapper objectMapper = new ObjectMapper(); - TestkitModule testkitModule = new TestkitModule(); + var objectMapper = new ObjectMapper(); + var testkitModule = new TestkitModule(); objectMapper.registerModule(testkitModule); objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); return objectMapper; diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/AbstractResultNext.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/AbstractResultNext.java index d3a0e1d0b7..35983db177 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/AbstractResultNext.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/AbstractResultNext.java @@ -30,7 +30,6 @@ import neo4j.org.testkit.backend.messages.responses.NullRecord; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; import org.neo4j.driver.Record; -import org.neo4j.driver.Result; import org.neo4j.driver.exceptions.NoSuchRecordException; import reactor.core.publisher.Mono; @@ -38,7 +37,7 @@ public abstract class AbstractResultNext implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { try { - Result result = testkitState.getResultHolder(getResultId()).getResult(); + var result = testkitState.getResultHolder(getResultId()).getResult(); return createResponse(result.next()); } catch (NoSuchRecordException ignored) { return NullRecord.builder().build(); @@ -57,15 +56,12 @@ public CompletionStage processAsync(TestkitState testkitState) @Override public Mono processRx(TestkitState testkitState) { return testkitState.getRxResultHolder(getResultId()).flatMap(resultHolder -> { - RxBufferedSubscriber subscriber = resultHolder - .getSubscriber() - .orElseGet(() -> { - RxBufferedSubscriber subscriberInstance = - new RxBufferedSubscriber<>(getFetchSize(resultHolder)); - resultHolder.setSubscriber(subscriberInstance); - resultHolder.getResult().records().subscribe(subscriberInstance); - return subscriberInstance; - }); + var subscriber = resultHolder.getSubscriber().orElseGet(() -> { + var subscriberInstance = new RxBufferedSubscriber(getFetchSize(resultHolder)); + resultHolder.setSubscriber(subscriberInstance); + resultHolder.getResult().records().subscribe(subscriberInstance); + return subscriberInstance; + }); return subscriber .next() .map(this::createResponse) @@ -76,15 +72,12 @@ public Mono processRx(TestkitState testkitState) { @Override public Mono processReactive(TestkitState testkitState) { return testkitState.getReactiveResultHolder(getResultId()).flatMap(resultHolder -> { - RxBufferedSubscriber subscriber = resultHolder - .getSubscriber() - .orElseGet(() -> { - RxBufferedSubscriber subscriberInstance = - new RxBufferedSubscriber<>(getFetchSize(resultHolder)); - resultHolder.setSubscriber(subscriberInstance); - resultHolder.getResult().records().subscribe(toFlowSubscriber(subscriberInstance)); - return subscriberInstance; - }); + var subscriber = resultHolder.getSubscriber().orElseGet(() -> { + var subscriberInstance = new RxBufferedSubscriber(getFetchSize(resultHolder)); + resultHolder.setSubscriber(subscriberInstance); + resultHolder.getResult().records().subscribe(toFlowSubscriber(subscriberInstance)); + return subscriberInstance; + }); return subscriber .next() .map(this::createResponse) @@ -95,15 +88,12 @@ public Mono processReactive(TestkitState testkitState) { @Override public Mono processReactiveStreams(TestkitState testkitState) { return testkitState.getReactiveResultStreamsHolder(getResultId()).flatMap(resultHolder -> { - RxBufferedSubscriber subscriber = resultHolder - .getSubscriber() - .orElseGet(() -> { - RxBufferedSubscriber subscriberInstance = - new RxBufferedSubscriber<>(getFetchSize(resultHolder)); - resultHolder.setSubscriber(subscriberInstance); - resultHolder.getResult().records().subscribe(subscriberInstance); - return subscriberInstance; - }); + var subscriber = resultHolder.getSubscriber().orElseGet(() -> { + var subscriberInstance = new RxBufferedSubscriber(getFetchSize(resultHolder)); + resultHolder.setSubscriber(subscriberInstance); + resultHolder.getResult().records().subscribe(subscriberInstance); + return subscriberInstance; + }); return subscriber .next() .map(this::createResponse) diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckDriverIsEncrypted.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckDriverIsEncrypted.java index 6125959cc5..167984b779 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckDriverIsEncrypted.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckDriverIsEncrypted.java @@ -23,7 +23,6 @@ import lombok.Getter; import lombok.Setter; import neo4j.org.testkit.backend.TestkitState; -import neo4j.org.testkit.backend.holder.DriverHolder; import neo4j.org.testkit.backend.messages.responses.DriverIsEncrypted; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; import reactor.core.publisher.Mono; @@ -59,7 +58,7 @@ public Mono processReactiveStreams(TestkitState testkitState) { } private DriverIsEncrypted createResponse(TestkitState testkitState) { - DriverHolder driverHolder = testkitState.getDriverHolder(data.getDriverId()); + var driverHolder = testkitState.getDriverHolder(data.getDriverId()); return DriverIsEncrypted.builder() .data(DriverIsEncrypted.DriverIsEncryptedBody.builder() .encrypted(driverHolder.getDriver().isEncrypted()) diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckMultiDBSupport.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckMultiDBSupport.java index e4cd94e9d1..fbe6908cf6 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckMultiDBSupport.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckMultiDBSupport.java @@ -33,8 +33,8 @@ public class CheckMultiDBSupport implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { - String driverId = data.getDriverId(); - boolean available = testkitState.getDriverHolder(driverId).getDriver().supportsMultiDb(); + var driverId = data.getDriverId(); + var available = testkitState.getDriverHolder(driverId).getDriver().supportsMultiDb(); return createResponse(available); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CypherTypeField.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CypherTypeField.java index eb7bab62c2..e957951184 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CypherTypeField.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CypherTypeField.java @@ -29,7 +29,6 @@ import neo4j.org.testkit.backend.messages.responses.Field; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; import org.neo4j.driver.Record; -import org.neo4j.driver.Value; import org.neo4j.driver.types.Entity; import org.neo4j.driver.types.Path; @@ -40,9 +39,9 @@ public class CypherTypeField extends AbstractResultNext { @Override protected neo4j.org.testkit.backend.messages.responses.TestkitResponse createResponse(Record record) { - Value value = record.get(data.getRecordKey()); - String type = data.getType(); - String field = data.getField(); + var value = record.get(data.getRecordKey()); + var type = data.getType(); + var field = data.getField(); String fieldValue = null; TestkitResponse testkitResponse = null; @@ -79,10 +78,10 @@ protected String getResultId() { } private String readPath(Path path) throws Throwable { - String[] parts = data.getField().split("\\."); - String propertyName = parts[0]; - int index = Integer.parseInt(parts[1]); - String methodName = parts[2]; + var parts = data.getField().split("\\."); + var propertyName = parts[0]; + var index = Integer.parseInt(parts[1]); + var methodName = parts[2]; Supplier> iterableSupplier; if ("nodes".equals(propertyName)) { @@ -93,7 +92,7 @@ private String readPath(Path path) throws Throwable { throw new RuntimeException("Unexpected"); } - Entity entity = getEntity(iterableSupplier.get(), index); + var entity = getEntity(iterableSupplier.get(), index); return readProperty(entity, methodName); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetConnectionPoolMetrics.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetConnectionPoolMetrics.java index ef521b8c4a..529f51f447 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetConnectionPoolMetrics.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetConnectionPoolMetrics.java @@ -19,16 +19,13 @@ package neo4j.org.testkit.backend.messages.requests; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import lombok.Getter; import lombok.Setter; import neo4j.org.testkit.backend.TestkitState; -import neo4j.org.testkit.backend.holder.DriverHolder; import neo4j.org.testkit.backend.messages.responses.ConnectionPoolMetrics; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; -import org.neo4j.driver.Metrics; import org.neo4j.driver.internal.BoltServerAddress; import org.neo4j.driver.net.ServerAddress; import reactor.core.publisher.Mono; @@ -64,15 +61,15 @@ public Mono processReactiveStreams(TestkitState testkitState) { } private ConnectionPoolMetrics getConnectionPoolMetrics(TestkitState testkitState) { - DriverHolder driverHolder = testkitState.getDriverHolder(data.getDriverId()); - Metrics metrics = driverHolder.getDriver().metrics(); - org.neo4j.driver.ConnectionPoolMetrics poolMetrics = metrics.connectionPoolMetrics().stream() + var driverHolder = testkitState.getDriverHolder(data.getDriverId()); + var metrics = driverHolder.getDriver().metrics(); + var poolMetrics = metrics.connectionPoolMetrics().stream() .filter(pm -> { // Brute forcing the access via reflections avoid having the InternalConnectionPoolMetrics a public // class ServerAddress poolAddress; try { - Method m = pm.getClass().getDeclaredMethod("getAddress"); + var m = pm.getClass().getDeclaredMethod("getAddress"); m.setAccessible(true); poolAddress = (ServerAddress) m.invoke(pm); } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetRoutingTable.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetRoutingTable.java index 433c0dc955..871cec7e6f 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetRoutingTable.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetRoutingTable.java @@ -29,10 +29,7 @@ import neo4j.org.testkit.backend.messages.responses.RoutingTable; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; import org.neo4j.driver.internal.BoltServerAddress; -import org.neo4j.driver.internal.DatabaseName; import org.neo4j.driver.internal.DatabaseNameUtil; -import org.neo4j.driver.internal.cluster.RoutingTableHandler; -import org.neo4j.driver.internal.cluster.RoutingTableRegistry; import reactor.core.publisher.Mono; @Setter @@ -47,22 +44,21 @@ public class GetRoutingTable implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { - RoutingTableRegistry routingTableRegistry = - testkitState.getRoutingTableRegistry().get(data.getDriverId()); + var routingTableRegistry = testkitState.getRoutingTableRegistry().get(data.getDriverId()); if (routingTableRegistry == null) { throw new IllegalStateException(String.format( "There is no routing table registry for '%s' driver. (It might be a direct driver)", data.getDriverId())); } - DatabaseName databaseName = DatabaseNameUtil.database(data.getDatabase()); - RoutingTableHandler routingTableHandler = routingTableRegistry + var databaseName = DatabaseNameUtil.database(data.getDatabase()); + var routingTableHandler = routingTableRegistry .getRoutingTableHandler(databaseName) .orElseThrow(() -> new IllegalStateException(String.format( "There is no routing table handler for the '%s' database.", databaseName.databaseName().orElse("null")))); - org.neo4j.driver.internal.cluster.RoutingTable routingTable = routingTableHandler.routingTable(); + var routingTable = routingTableHandler.routingTable(); return RoutingTable.builder() .data(RoutingTable.RoutingTableBody.builder() diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewAuthTokenManager.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewAuthTokenManager.java index a4c0716f14..f720faaea9 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewAuthTokenManager.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewAuthTokenManager.java @@ -95,7 +95,7 @@ public void onExpired(AuthToken authToken) { private CompletionStage dispatchTestkitCallback( TestkitState testkitState, TestkitCallback response) { - CompletableFuture future = new CompletableFuture<>(); + var future = new CompletableFuture(); testkitState.getCallbackIdToFuture().put(response.getCallbackId(), future); testkitState.getResponseWriter().accept(response); return future; diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewBookmarkManager.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewBookmarkManager.java index 15e1486598..5de91543a6 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewBookmarkManager.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewBookmarkManager.java @@ -90,7 +90,7 @@ private BookmarkManager createBookmarkManagerAndResponse(TestkitState testkitSta private CompletionStage dispatchTestkitCallback( TestkitState testkitState, TestkitCallback response) { - CompletableFuture future = new CompletableFuture<>(); + var future = new CompletableFuture(); testkitState.getCallbackIdToFuture().put(response.getCallbackId(), future); testkitState.getResponseWriter().accept(response); return future; diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java index 8eb77b35bd..6dd412664f 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java @@ -57,7 +57,6 @@ import org.neo4j.driver.internal.InternalNotificationSeverity; import org.neo4j.driver.internal.SecuritySettings; import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancer; -import org.neo4j.driver.internal.security.SecurityPlan; import org.neo4j.driver.internal.security.SecurityPlans; import org.neo4j.driver.internal.security.StaticAuthTokenManager; import org.neo4j.driver.net.ServerAddressResolver; @@ -70,7 +69,7 @@ public class NewDriver implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { - String id = testkitState.newId(); + var id = testkitState.newId(); AuthTokenManager authTokenManager; if (data.getAuthTokenManagerId() != null) { @@ -80,7 +79,7 @@ public TestkitResponse process(TestkitState testkitState) { authTokenManager = new StaticAuthTokenManager(authToken); } - Config.ConfigBuilder configBuilder = Config.builder(); + var configBuilder = Config.builder(); if (data.isResolverRegistered()) { configBuilder.withResolver(callbackResolver(testkitState)); } @@ -105,7 +104,7 @@ public TestkitResponse process(TestkitState testkitState) { configBuilder.withDriverMetrics(); configBuilder.withLogging(testkitState.getLogging()); org.neo4j.driver.Driver driver; - Config config = configBuilder.build(); + var config = configBuilder.build(); try { driver = driver( URI.create(data.uri), @@ -144,15 +143,13 @@ public Mono processReactiveStreams(TestkitState testkitState) { private ServerAddressResolver callbackResolver(TestkitState testkitState) { return address -> { - String callbackId = testkitState.newId(); - ResolverResolutionRequired.ResolverResolutionRequiredBody body = - ResolverResolutionRequired.ResolverResolutionRequiredBody.builder() - .id(callbackId) - .address(String.format("%s:%d", address.host(), address.port())) - .build(); - ResolverResolutionRequired response = - ResolverResolutionRequired.builder().data(body).build(); - CompletionStage c = dispatchTestkitCallback(testkitState, response); + var callbackId = testkitState.newId(); + var body = ResolverResolutionRequired.ResolverResolutionRequiredBody.builder() + .id(callbackId) + .address(String.format("%s:%d", address.host(), address.port())) + .build(); + var response = ResolverResolutionRequired.builder().data(body).build(); + var c = dispatchTestkitCallback(testkitState, response); ResolverResolutionCompleted resolutionCompleted; try { resolutionCompleted = @@ -168,16 +165,14 @@ private ServerAddressResolver callbackResolver(TestkitState testkitState) { private DomainNameResolver callbackDomainNameResolver(TestkitState testkitState) { return address -> { - String callbackId = testkitState.newId(); - DomainNameResolutionRequired.DomainNameResolutionRequiredBody body = - DomainNameResolutionRequired.DomainNameResolutionRequiredBody.builder() - .id(callbackId) - .name(address) - .build(); - DomainNameResolutionRequired callback = - DomainNameResolutionRequired.builder().data(body).build(); + var callbackId = testkitState.newId(); + var body = DomainNameResolutionRequired.DomainNameResolutionRequiredBody.builder() + .id(callbackId) + .name(address) + .build(); + var callback = DomainNameResolutionRequired.builder().data(body).build(); - CompletionStage callbackStage = dispatchTestkitCallback(testkitState, callback); + var callbackStage = dispatchTestkitCallback(testkitState, callback); DomainNameResolutionCompleted resolutionCompleted; try { resolutionCompleted = (DomainNameResolutionCompleted) @@ -200,7 +195,7 @@ private DomainNameResolver callbackDomainNameResolver(TestkitState testkitState) private CompletionStage dispatchTestkitCallback( TestkitState testkitState, TestkitCallback response) { - CompletableFuture future = new CompletableFuture<>(); + var future = new CompletableFuture(); testkitState.getCallbackIdToFuture().put(response.getCallbackId(), future); testkitState.getResponseWriter().accept(response); return future; @@ -214,8 +209,8 @@ private org.neo4j.driver.Driver driver( SecuritySettings.SecuritySettingsBuilder securitySettingsBuilder, TestkitState testkitState, String driverId) { - SecuritySettings securitySettings = securitySettingsBuilder.build(); - SecurityPlan securityPlan = SecurityPlans.createSecurityPlan(securitySettings, uri.getScheme()); + var securitySettings = securitySettingsBuilder.build(); + var securityPlan = SecurityPlans.createSecurityPlan(securitySettings, uri.getScheme()); return new DriverFactoryWithDomainNameResolver(domainNameResolver, testkitState, driverId) .newInstance(uri, authTokenManager, config, securityPlan, null, null); } @@ -224,8 +219,8 @@ private Optional handleExceptionAsErrorResponse(TestkitState te Optional response = Optional.empty(); if (e instanceof IllegalArgumentException && e.getMessage().startsWith(DriverFactory.NO_ROUTING_CONTEXT_ERROR_MESSAGE)) { - String id = testkitState.newId(); - String errorType = e.getClass().getName(); + var id = testkitState.newId(); + var errorType = e.getClass().getName(); response = Optional.of(DriverError.builder() .data(DriverError.DriverErrorBody.builder() .id(id) @@ -238,8 +233,7 @@ private Optional handleExceptionAsErrorResponse(TestkitState te } private SecuritySettings.SecuritySettingsBuilder configureSecuritySettingsBuilder() { - SecuritySettings.SecuritySettingsBuilder securitySettingsBuilder = - new SecuritySettings.SecuritySettingsBuilder(); + var securitySettingsBuilder = new SecuritySettings.SecuritySettingsBuilder(); if (data.encrypted) { securitySettingsBuilder.withEncryption(); } else { @@ -248,7 +242,7 @@ private SecuritySettings.SecuritySettingsBuilder configureSecuritySettingsBuilde if (data.trustedCertificates != null) { if (!data.trustedCertificates.isEmpty()) { - File[] certs = data.trustedCertificates.stream() + var certs = data.trustedCertificates.stream() .map(cert -> "/usr/local/share/custom-ca-certificates/" + cert) .map(Paths::get) .map(Path::toFile) diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewSession.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewSession.java index c0319a8340..0c59f496ad 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewSession.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewSession.java @@ -116,8 +116,8 @@ protected TestkitResponse createSessionStateAndResponse( ? AuthTokenUtil.parseAuthToken(data.getAuthorizationToken()) : null; - T sessionStateHolder = sessionStateProducer.apply(driverHolder, builder.build(), userSwitchAuthToken); - String newId = addSessionHolder.apply(sessionStateHolder); + var sessionStateHolder = sessionStateProducer.apply(driverHolder, builder.build(), userSwitchAuthToken); + var newId = addSessionHolder.apply(sessionStateHolder); return Session.builder() .data(Session.SessionBody.builder().id(newId).build()) diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultConsume.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultConsume.java index b2575a03cb..6106becf50 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultConsume.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultConsume.java @@ -27,7 +27,6 @@ import neo4j.org.testkit.backend.messages.responses.NullRecord; import neo4j.org.testkit.backend.messages.responses.Summary; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; -import org.neo4j.driver.Result; import org.neo4j.driver.exceptions.NoSuchRecordException; import org.neo4j.driver.summary.ResultSummary; import reactor.core.publisher.Mono; @@ -40,7 +39,7 @@ public class ResultConsume implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { try { - Result result = testkitState.getResultHolder(data.getResultId()).getResult(); + var result = testkitState.getResultHolder(data.getResultId()).getResult(); return createResponse(result.consume()); } catch (NoSuchRecordException ignored) { return NullRecord.builder().build(); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultList.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultList.java index 8653560d10..0636ca4057 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultList.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultList.java @@ -65,7 +65,7 @@ public Mono processReactiveStreams(TestkitState testkitState) { } private RecordList createResponse(List records) { - List mappedRecords = records.stream() + var mappedRecords = records.stream() .map(record -> Record.RecordBody.builder().values(record).build()) .collect(Collectors.toList()); return RecordList.builder() diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultPeek.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultPeek.java index 853f0edafa..d57be7aa3d 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultPeek.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultPeek.java @@ -25,7 +25,6 @@ import neo4j.org.testkit.backend.messages.responses.NullRecord; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; import org.neo4j.driver.Record; -import org.neo4j.driver.Result; import org.neo4j.driver.exceptions.NoSuchRecordException; import reactor.core.publisher.Mono; @@ -37,7 +36,7 @@ public class ResultPeek implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { try { - Result result = testkitState.getResultHolder(data.getResultId()).getResult(); + var result = testkitState.getResultHolder(data.getResultId()).getResult(); return createResponse(result.peek()); } catch (NoSuchRecordException ignored) { return NullRecord.builder().build(); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryableNegative.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryableNegative.java index 569b19e1c5..62cd5561a5 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryableNegative.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryableNegative.java @@ -23,7 +23,6 @@ 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; import reactor.core.publisher.Mono; @@ -34,7 +33,7 @@ public class RetryableNegative implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { - SessionHolder sessionHolder = testkitState.getSessionHolder(data.sessionId); + var sessionHolder = testkitState.getSessionHolder(data.sessionId); Throwable throwable; if (!"".equals(data.getErrorId())) { throwable = testkitState.getErrors().get(data.getErrorId()); 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 index 73adffd899..ff65a5d9e5 100644 --- 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 @@ -22,7 +22,6 @@ import lombok.Getter; import lombok.Setter; import neo4j.org.testkit.backend.TestkitState; -import neo4j.org.testkit.backend.holder.SessionHolder; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; import reactor.core.publisher.Mono; @@ -33,7 +32,7 @@ public class RetryablePositive implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { - SessionHolder sessionHolder = testkitState.getSessionHolder(data.sessionId); + var sessionHolder = testkitState.getSessionHolder(data.sessionId); if (sessionHolder == null) { throw new RuntimeException("Could not find session"); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionBeginTransaction.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionBeginTransaction.java index 6df030315c..7767fff200 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionBeginTransaction.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionBeginTransaction.java @@ -28,33 +28,28 @@ import neo4j.org.testkit.backend.holder.ReactiveTransactionHolder; import neo4j.org.testkit.backend.holder.ReactiveTransactionStreamsHolder; import neo4j.org.testkit.backend.holder.RxTransactionHolder; -import neo4j.org.testkit.backend.holder.SessionHolder; import neo4j.org.testkit.backend.holder.TransactionHolder; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; import neo4j.org.testkit.backend.messages.responses.Transaction; -import org.neo4j.driver.Session; import org.neo4j.driver.TransactionConfig; -import org.neo4j.driver.async.AsyncSession; -import org.neo4j.driver.reactive.ReactiveSession; -import org.neo4j.driver.reactive.RxSession; import reactor.core.publisher.Mono; public class SessionBeginTransaction extends AbstractTestkitRequestWithTransactionConfig { @Override public TestkitResponse process(TestkitState testkitState) { - SessionHolder sessionHolder = testkitState.getSessionHolder(data.getSessionId()); - Session session = sessionHolder.getSession(); + var sessionHolder = testkitState.getSessionHolder(data.getSessionId()); + var session = sessionHolder.getSession(); - org.neo4j.driver.Transaction transaction = session.beginTransaction(buildTxConfig()); + var transaction = session.beginTransaction(buildTxConfig()); return transaction(testkitState.addTransactionHolder(new TransactionHolder(sessionHolder, transaction))); } @Override public CompletionStage processAsync(TestkitState testkitState) { return testkitState.getAsyncSessionHolder(data.getSessionId()).thenCompose(sessionHolder -> { - AsyncSession session = sessionHolder.getSession(); - TransactionConfig.Builder builder = TransactionConfig.builder(); + var session = sessionHolder.getSession(); + var builder = TransactionConfig.builder(); return session.beginTransactionAsync(buildTxConfig()) .thenApply(tx -> transaction( @@ -66,8 +61,8 @@ public CompletionStage processAsync(TestkitState testkitState) @SuppressWarnings("deprecation") public Mono processRx(TestkitState testkitState) { return testkitState.getRxSessionHolder(data.getSessionId()).flatMap(sessionHolder -> { - RxSession session = sessionHolder.getSession(); - TransactionConfig.Builder builder = TransactionConfig.builder(); + var session = sessionHolder.getSession(); + var builder = TransactionConfig.builder(); return Mono.fromDirect(session.beginTransaction(buildTxConfig())) .map(tx -> transaction( @@ -78,8 +73,8 @@ public Mono processRx(TestkitState testkitState) { @Override public Mono processReactive(TestkitState testkitState) { return testkitState.getReactiveSessionHolder(data.getSessionId()).flatMap(sessionHolder -> { - ReactiveSession session = sessionHolder.getSession(); - TransactionConfig.Builder builder = TransactionConfig.builder(); + var session = sessionHolder.getSession(); + var builder = TransactionConfig.builder(); return Mono.fromDirect(flowPublisherToFlux(session.beginTransaction(buildTxConfig()))) .map(tx -> transaction(testkitState.addReactiveTransactionHolder( @@ -91,7 +86,7 @@ public Mono processReactive(TestkitState testkitState) { public Mono processReactiveStreams(TestkitState testkitState) { return testkitState.getReactiveSessionStreamsHolder(data.getSessionId()).flatMap(sessionHolder -> { var session = sessionHolder.getSession(); - TransactionConfig.Builder builder = TransactionConfig.builder(); + var builder = TransactionConfig.builder(); return Mono.fromDirect(session.beginTransaction(buildTxConfig())) .map(tx -> transaction(testkitState.addReactiveTransactionStreamsHolder( diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionLastBookmarks.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionLastBookmarks.java index a4673cfe29..c82b281d15 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionLastBookmarks.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionLastBookmarks.java @@ -24,7 +24,6 @@ import lombok.Getter; import lombok.Setter; import neo4j.org.testkit.backend.TestkitState; -import neo4j.org.testkit.backend.holder.SessionHolder; import neo4j.org.testkit.backend.messages.responses.Bookmarks; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; import org.neo4j.driver.Bookmark; @@ -37,7 +36,7 @@ public class SessionLastBookmarks implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { - SessionHolder sessionHolder = testkitState.getSessionHolder(data.getSessionId()); + var sessionHolder = testkitState.getSessionHolder(data.getSessionId()); return createResponse(sessionHolder.getSession().lastBookmarks()); } 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 index 60167f1e6c..2302b3a18a 100644 --- 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 @@ -38,9 +38,7 @@ import neo4j.org.testkit.backend.messages.responses.RetryableDone; import neo4j.org.testkit.backend.messages.responses.RetryableTry; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; -import org.neo4j.driver.Session; import org.neo4j.driver.TransactionWork; -import org.neo4j.driver.async.AsyncSession; import org.neo4j.driver.async.AsyncTransactionWork; import org.neo4j.driver.reactive.ReactiveTransactionCallback; import org.neo4j.driver.reactive.RxTransactionWork; @@ -52,8 +50,8 @@ public class SessionReadTransaction @Override @SuppressWarnings("deprecation") public TestkitResponse process(TestkitState testkitState) { - SessionHolder sessionHolder = testkitState.getSessionHolder(data.getSessionId()); - Session session = sessionHolder.getSession(); + var sessionHolder = testkitState.getSessionHolder(data.getSessionId()); + var session = sessionHolder.getSession(); session.readTransaction(handle(testkitState, sessionHolder), buildTxConfig()); return retryableDone(); } @@ -64,13 +62,13 @@ public CompletionStage processAsync(TestkitState testkitState) return testkitState .getAsyncSessionHolder(data.getSessionId()) .thenCompose(sessionHolder -> { - AsyncSession session = sessionHolder.getSession(); + var session = sessionHolder.getSession(); AsyncTransactionWork> workWrapper = tx -> { - String txId = + var txId = testkitState.addAsyncTransactionHolder(new AsyncTransactionHolder(sessionHolder, tx)); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture txWorkFuture = new CompletableFuture<>(); + var txWorkFuture = new CompletableFuture(); sessionHolder.setTxWorkFuture(txWorkFuture); return txWorkFuture; }; @@ -87,9 +85,9 @@ public Mono processRx(TestkitState testkitState) { .getRxSessionHolder(data.getSessionId()) .flatMap(sessionHolder -> { RxTransactionWork> workWrapper = tx -> { - String txId = testkitState.addRxTransactionHolder(new RxTransactionHolder(sessionHolder, tx)); + var txId = testkitState.addRxTransactionHolder(new RxTransactionHolder(sessionHolder, tx)); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture tryResult = new CompletableFuture<>(); + var tryResult = new CompletableFuture(); sessionHolder.setTxWorkFuture(tryResult); return Mono.fromCompletionStage(tryResult); }; @@ -105,10 +103,10 @@ public Mono processReactive(TestkitState testkitState) { .getReactiveSessionHolder(data.getSessionId()) .flatMap(sessionHolder -> { ReactiveTransactionCallback> workWrapper = tx -> { - String txId = testkitState.addReactiveTransactionHolder(new ReactiveTransactionHolder( + var txId = testkitState.addReactiveTransactionHolder(new ReactiveTransactionHolder( sessionHolder, new ReactiveTransactionContextAdapter(tx))); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture tryResult = new CompletableFuture<>(); + var tryResult = new CompletableFuture(); sessionHolder.setTxWorkFuture(tryResult); return publisherToFlowPublisher(Mono.fromCompletionStage(tryResult)); }; @@ -125,11 +123,11 @@ public Mono processReactiveStreams(TestkitState testkitState) { .getReactiveSessionStreamsHolder(data.getSessionId()) .flatMap(sessionHolder -> { org.neo4j.driver.reactivestreams.ReactiveTransactionCallback> workWrapper = tx -> { - String txId = + var txId = testkitState.addReactiveTransactionStreamsHolder(new ReactiveTransactionStreamsHolder( sessionHolder, new ReactiveTransactionContextStreamsAdapter(tx))); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture tryResult = new CompletableFuture<>(); + var tryResult = new CompletableFuture(); sessionHolder.setTxWorkFuture(tryResult); return Mono.fromCompletionStage(tryResult); }; @@ -142,15 +140,15 @@ public Mono processReactiveStreams(TestkitState testkitState) { @SuppressWarnings("deprecation") private TransactionWork handle(TestkitState testkitState, SessionHolder sessionHolder) { return tx -> { - String txId = testkitState.addTransactionHolder(new TransactionHolder(sessionHolder, tx)); + var txId = testkitState.addTransactionHolder(new TransactionHolder(sessionHolder, tx)); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture txWorkFuture = new CompletableFuture<>(); + var txWorkFuture = new CompletableFuture(); sessionHolder.setTxWorkFuture(txWorkFuture); try { return txWorkFuture.get(); } catch (Throwable throwable) { - Throwable workThrowable = throwable; + var workThrowable = throwable; if (workThrowable instanceof ExecutionException) { workThrowable = workThrowable.getCause(); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionRun.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionRun.java index 01758e8610..ab556ac5d8 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionRun.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionRun.java @@ -33,28 +33,22 @@ import neo4j.org.testkit.backend.holder.ResultCursorHolder; import neo4j.org.testkit.backend.holder.ResultHolder; import neo4j.org.testkit.backend.holder.RxResultHolder; -import neo4j.org.testkit.backend.holder.SessionHolder; import neo4j.org.testkit.backend.messages.requests.deserializer.TestkitCypherParamDeserializer; import neo4j.org.testkit.backend.messages.responses.Result; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; import org.neo4j.driver.Query; -import org.neo4j.driver.Session; -import org.neo4j.driver.async.AsyncSession; -import org.neo4j.driver.reactive.ReactiveSession; -import org.neo4j.driver.reactive.RxResult; -import org.neo4j.driver.reactive.RxSession; import reactor.core.publisher.Mono; public class SessionRun extends AbstractTestkitRequestWithTransactionConfig { @Override public TestkitResponse process(TestkitState testkitState) { - SessionHolder sessionHolder = testkitState.getSessionHolder(data.getSessionId()); - Session session = sessionHolder.getSession(); - Query query = Optional.ofNullable(data.params) + var sessionHolder = testkitState.getSessionHolder(data.getSessionId()); + var session = sessionHolder.getSession(); + var query = Optional.ofNullable(data.params) .map(params -> new Query(data.cypher, data.params)) .orElseGet(() -> new Query(data.cypher)); - org.neo4j.driver.Result result = session.run(query, buildTxConfig()); - String id = testkitState.addResultHolder(new ResultHolder(sessionHolder, result)); + var result = session.run(query, buildTxConfig()); + var id = testkitState.addResultHolder(new ResultHolder(sessionHolder, result)); return createResponse(id, result.keys()); } @@ -62,13 +56,13 @@ public TestkitResponse process(TestkitState testkitState) { @Override public CompletionStage processAsync(TestkitState testkitState) { return testkitState.getAsyncSessionHolder(data.getSessionId()).thenCompose(sessionHolder -> { - AsyncSession session = sessionHolder.getSession(); - Query query = Optional.ofNullable(data.params) + var session = sessionHolder.getSession(); + var query = Optional.ofNullable(data.params) .map(params -> new Query(data.cypher, data.params)) .orElseGet(() -> new Query(data.cypher)); return session.runAsync(query, buildTxConfig()).thenApply(resultCursor -> { - String id = testkitState.addAsyncResultHolder(new ResultCursorHolder(sessionHolder, resultCursor)); + var id = testkitState.addAsyncResultHolder(new ResultCursorHolder(sessionHolder, resultCursor)); return createResponse(id, resultCursor.keys()); }); }); @@ -78,13 +72,13 @@ public CompletionStage processAsync(TestkitState testkitState) @SuppressWarnings("deprecation") public Mono processRx(TestkitState testkitState) { return testkitState.getRxSessionHolder(data.getSessionId()).flatMap(sessionHolder -> { - RxSession session = sessionHolder.getSession(); - Query query = Optional.ofNullable(data.params) + var session = sessionHolder.getSession(); + var query = Optional.ofNullable(data.params) .map(params -> new Query(data.cypher, data.params)) .orElseGet(() -> new Query(data.cypher)); - RxResult result = session.run(query, buildTxConfig()); - String id = testkitState.addRxResultHolder(new RxResultHolder(sessionHolder, result)); + var result = session.run(query, buildTxConfig()); + var id = testkitState.addRxResultHolder(new RxResultHolder(sessionHolder, result)); // The keys() method causes RUN message exchange. // However, it does not currently report errors. @@ -95,15 +89,14 @@ public Mono processRx(TestkitState testkitState) { @Override public Mono processReactive(TestkitState testkitState) { return testkitState.getReactiveSessionHolder(data.getSessionId()).flatMap(sessionHolder -> { - ReactiveSession session = sessionHolder.getSession(); - Query query = Optional.ofNullable(data.params) + var session = sessionHolder.getSession(); + var query = Optional.ofNullable(data.params) .map(params -> new Query(data.cypher, data.params)) .orElseGet(() -> new Query(data.cypher)); return Mono.fromDirect(flowPublisherToFlux(session.run(query, buildTxConfig()))) .map(result -> { - String id = - testkitState.addReactiveResultHolder(new ReactiveResultHolder(sessionHolder, result)); + var id = testkitState.addReactiveResultHolder(new ReactiveResultHolder(sessionHolder, result)); return createResponse(id, result.keys()); }); }); @@ -113,12 +106,12 @@ public Mono processReactive(TestkitState testkitState) { public Mono processReactiveStreams(TestkitState testkitState) { return testkitState.getReactiveSessionStreamsHolder(data.getSessionId()).flatMap(sessionHolder -> { var session = sessionHolder.getSession(); - Query query = Optional.ofNullable(data.params) + var query = Optional.ofNullable(data.params) .map(params -> new Query(data.cypher, data.params)) .orElseGet(() -> new Query(data.cypher)); return Mono.fromDirect(session.run(query, buildTxConfig())).map(result -> { - String id = testkitState.addReactiveResultStreamsHolder( + var id = testkitState.addReactiveResultStreamsHolder( new ReactiveResultStreamsHolder(sessionHolder, result)); return createResponse(id, result.keys()); }); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java index d942af21e4..b238c43687 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java @@ -38,9 +38,7 @@ import neo4j.org.testkit.backend.messages.responses.RetryableDone; import neo4j.org.testkit.backend.messages.responses.RetryableTry; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; -import org.neo4j.driver.Session; import org.neo4j.driver.TransactionWork; -import org.neo4j.driver.async.AsyncSession; import org.neo4j.driver.async.AsyncTransactionWork; import org.neo4j.driver.reactive.ReactiveTransactionCallback; import org.neo4j.driver.reactive.RxTransactionWork; @@ -52,8 +50,8 @@ public class SessionWriteTransaction @Override @SuppressWarnings("deprecation") public TestkitResponse process(TestkitState testkitState) { - SessionHolder sessionHolder = testkitState.getSessionHolder(data.getSessionId()); - Session session = sessionHolder.getSession(); + var sessionHolder = testkitState.getSessionHolder(data.getSessionId()); + var session = sessionHolder.getSession(); session.writeTransaction(handle(testkitState, sessionHolder), buildTxConfig()); return retryableDone(); } @@ -64,13 +62,13 @@ public CompletionStage processAsync(TestkitState testkitState) return testkitState .getAsyncSessionHolder(data.getSessionId()) .thenCompose(sessionHolder -> { - AsyncSession session = sessionHolder.getSession(); + var session = sessionHolder.getSession(); AsyncTransactionWork> workWrapper = tx -> { - String txId = + var txId = testkitState.addAsyncTransactionHolder(new AsyncTransactionHolder(sessionHolder, tx)); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture tryResult = new CompletableFuture<>(); + var tryResult = new CompletableFuture(); sessionHolder.setTxWorkFuture(tryResult); return tryResult; }; @@ -87,9 +85,9 @@ public Mono processRx(TestkitState testkitState) { .getRxSessionHolder(data.getSessionId()) .flatMap(sessionHolder -> { RxTransactionWork> workWrapper = tx -> { - String txId = testkitState.addRxTransactionHolder(new RxTransactionHolder(sessionHolder, tx)); + var txId = testkitState.addRxTransactionHolder(new RxTransactionHolder(sessionHolder, tx)); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture tryResult = new CompletableFuture<>(); + var tryResult = new CompletableFuture(); sessionHolder.setTxWorkFuture(tryResult); return Mono.fromCompletionStage(tryResult); }; @@ -105,10 +103,10 @@ public Mono processReactive(TestkitState testkitState) { .getReactiveSessionHolder(data.getSessionId()) .flatMap(sessionHolder -> { ReactiveTransactionCallback> workWrapper = tx -> { - String txId = testkitState.addReactiveTransactionHolder(new ReactiveTransactionHolder( + var txId = testkitState.addReactiveTransactionHolder(new ReactiveTransactionHolder( sessionHolder, new ReactiveTransactionContextAdapter(tx))); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture tryResult = new CompletableFuture<>(); + var tryResult = new CompletableFuture(); sessionHolder.setTxWorkFuture(tryResult); return publisherToFlowPublisher(Mono.fromCompletionStage(tryResult)); }; @@ -125,11 +123,11 @@ public Mono processReactiveStreams(TestkitState testkitState) { .getReactiveSessionStreamsHolder(data.getSessionId()) .flatMap(sessionHolder -> { org.neo4j.driver.reactivestreams.ReactiveTransactionCallback> workWrapper = tx -> { - String txId = + var txId = testkitState.addReactiveTransactionStreamsHolder(new ReactiveTransactionStreamsHolder( sessionHolder, new ReactiveTransactionContextStreamsAdapter(tx))); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture tryResult = new CompletableFuture<>(); + var tryResult = new CompletableFuture(); sessionHolder.setTxWorkFuture(tryResult); return Mono.fromCompletionStage(tryResult); }; @@ -142,15 +140,15 @@ public Mono processReactiveStreams(TestkitState testkitState) { @SuppressWarnings("deprecation") private TransactionWork handle(TestkitState testkitState, SessionHolder sessionHolder) { return tx -> { - String txId = testkitState.addTransactionHolder(new TransactionHolder(sessionHolder, tx)); + var txId = testkitState.addTransactionHolder(new TransactionHolder(sessionHolder, tx)); testkitState.getResponseWriter().accept(retryableTry(txId)); - CompletableFuture txWorkFuture = new CompletableFuture<>(); + var txWorkFuture = new CompletableFuture(); sessionHolder.setTxWorkFuture(txWorkFuture); try { return txWorkFuture.get(); } catch (Throwable throwable) { - Throwable workThrowable = throwable; + var workThrowable = throwable; if (workThrowable instanceof ExecutionException) { workThrowable = workThrowable.getCause(); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartSubTest.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartSubTest.java index 8429828233..64903be154 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartSubTest.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartSubTest.java @@ -72,7 +72,7 @@ static SkipDecision ofSkipped(String reason) { private static final Map REACTIVE_SKIP_PATTERN_TO_CHECK = new HashMap<>(); private static SkipDecision checkTzIdSupported(Map params) { - String tzId = (String) params.get("tz_id"); + var tzId = (String) params.get("tz_id"); try { ZoneId.of(tzId); return SkipDecision.ofNonSkipped(); @@ -83,26 +83,26 @@ private static SkipDecision checkTzIdSupported(Map params) { private static SkipDecision checkDateTimeSupported(Map params) { @SuppressWarnings("unchecked") - HashMap dt_param = (HashMap) params.get("dt"); + var dt_param = (HashMap) params.get("dt"); if (dt_param == null) { throw new RuntimeException("params expected to contain 'dt'"); } @SuppressWarnings("unchecked") - HashMap data = (HashMap) dt_param.get("data"); + var data = (HashMap) dt_param.get("data"); if (data == null) { throw new RuntimeException("param 'dt' expected to contain 'data'"); } - Integer year = (Integer) data.get("year"); - Integer month = (Integer) data.get("month"); - Integer day = (Integer) data.get("day"); - Integer hour = (Integer) data.get("hour"); - Integer minute = (Integer) data.get("minute"); - Integer second = (Integer) data.get("second"); - Integer nano = (Integer) data.get("nanosecond"); - Integer utcOffset = (Integer) data.get("utc_offset_s"); - String tzId = (String) data.get("timezone_id"); + var year = (Integer) data.get("year"); + var month = (Integer) data.get("month"); + var day = (Integer) data.get("day"); + var hour = (Integer) data.get("hour"); + var minute = (Integer) data.get("minute"); + var second = (Integer) data.get("second"); + var nano = (Integer) data.get("nanosecond"); + var utcOffset = (Integer) data.get("utc_offset_s"); + var tzId = (String) data.get("timezone_id"); try { - ZonedDateTime dt = ZonedDateTime.of(year, month, day, hour, minute, second, nano, ZoneId.of(tzId)); + var dt = ZonedDateTime.of(year, month, day, hour, minute, second, nano, ZoneId.of(tzId)); if (dt.getOffset().getTotalSeconds() != utcOffset) { throw new DateTimeException(String.format( "Unmatched UTC offset. TestKit expected %d, local zone db yielded %d", @@ -159,25 +159,25 @@ public TestkitResponse process(TestkitState testkitState) { @Override public CompletionStage processAsync(TestkitState testkitState) { - TestkitResponse testkitResponse = createResponse(ASYNC_SKIP_PATTERN_TO_CHECK); + var testkitResponse = createResponse(ASYNC_SKIP_PATTERN_TO_CHECK); return CompletableFuture.completedFuture(testkitResponse); } @Override public Mono processRx(TestkitState testkitState) { - TestkitResponse testkitResponse = createResponse(REACTIVE_LEGACY_SKIP_PATTERN_TO_CHECK); + var testkitResponse = createResponse(REACTIVE_LEGACY_SKIP_PATTERN_TO_CHECK); return Mono.just(testkitResponse); } @Override public Mono processReactive(TestkitState testkitState) { - TestkitResponse testkitResponse = createResponse(REACTIVE_SKIP_PATTERN_TO_CHECK); + var testkitResponse = createResponse(REACTIVE_SKIP_PATTERN_TO_CHECK); return Mono.just(testkitResponse); } @Override public Mono processReactiveStreams(TestkitState testkitState) { - TestkitResponse testkitResponse = createResponse(REACTIVE_LEGACY_SKIP_PATTERN_TO_CHECK); + var testkitResponse = createResponse(REACTIVE_LEGACY_SKIP_PATTERN_TO_CHECK); return Mono.just(testkitResponse); } @@ -186,7 +186,7 @@ private TestkitResponse createResponse(Map skipPat .filter(entry -> data.getTestName().matches(entry.getKey())) .findFirst() .map(entry -> { - SkipDecision decision = entry.getValue().check(data.getSubtestArguments()); + var decision = entry.getValue().check(data.getSubtestArguments()); if (decision.isSkipped()) { return SkipTest.builder() .data(SkipTest.SkipTestBody.builder() diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java index 89717dcf6d..3e210f55da 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java @@ -183,7 +183,7 @@ public TestkitResponse process(TestkitState testkitState) { @Override public CompletionStage processAsync(TestkitState testkitState) { - TestkitResponse testkitResponse = createSkipResponse(ASYNC_SKIP_PATTERN_TO_REASON) + var testkitResponse = createSkipResponse(ASYNC_SKIP_PATTERN_TO_REASON) .orElseGet(() -> StartSubTest.decidePerSubTestReactive(data.getTestName()) ? RunSubTests.builder().build() : RunTest.builder().build()); @@ -192,7 +192,7 @@ public CompletionStage processAsync(TestkitState testkitState) @Override public Mono processRx(TestkitState testkitState) { - TestkitResponse testkitResponse = createSkipResponse(REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON) + var testkitResponse = createSkipResponse(REACTIVE_LEGACY_SKIP_PATTERN_TO_REASON) .orElseGet(() -> StartSubTest.decidePerSubTestReactive(data.getTestName()) ? RunSubTests.builder().build() : RunTest.builder().build()); @@ -201,7 +201,7 @@ public Mono processRx(TestkitState testkitState) { @Override public Mono processReactive(TestkitState testkitState) { - TestkitResponse testkitResponse = createSkipResponse(REACTIVE_SKIP_PATTERN_TO_REASON) + var testkitResponse = createSkipResponse(REACTIVE_SKIP_PATTERN_TO_REASON) .orElseGet(() -> StartSubTest.decidePerSubTestReactive(data.getTestName()) ? RunSubTests.builder().build() : RunTest.builder().build()); @@ -210,7 +210,7 @@ public Mono processReactive(TestkitState testkitState) { @Override public Mono processReactiveStreams(TestkitState testkitState) { - TestkitResponse testkitResponse = createSkipResponse(REACTIVE_SKIP_PATTERN_TO_REASON) + var testkitResponse = createSkipResponse(REACTIVE_SKIP_PATTERN_TO_REASON) .orElseGet(() -> StartSubTest.decidePerSubTestReactive(data.getTestName()) ? RunSubTests.builder().build() : RunTest.builder().build()); 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 index 1e19c558df..ee62fae400 100644 --- 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 @@ -33,12 +33,9 @@ import neo4j.org.testkit.backend.holder.ResultCursorHolder; import neo4j.org.testkit.backend.holder.ResultHolder; import neo4j.org.testkit.backend.holder.RxResultHolder; -import neo4j.org.testkit.backend.holder.TransactionHolder; import neo4j.org.testkit.backend.messages.requests.deserializer.TestkitCypherParamDeserializer; import neo4j.org.testkit.backend.messages.responses.Result; import neo4j.org.testkit.backend.messages.responses.TestkitResponse; -import org.neo4j.driver.reactive.ReactiveTransaction; -import org.neo4j.driver.reactive.RxResult; import reactor.core.publisher.Mono; @Setter @@ -48,11 +45,11 @@ public class TransactionRun implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { - TransactionHolder transactionHolder = testkitState.getTransactionHolder(data.getTxId()); - org.neo4j.driver.Result result = transactionHolder + var transactionHolder = testkitState.getTransactionHolder(data.getTxId()); + var result = transactionHolder .getTransaction() .run(data.getCypher(), data.getParams() != null ? data.getParams() : Collections.emptyMap()); - String resultId = testkitState.addResultHolder(new ResultHolder(transactionHolder, result)); + var resultId = testkitState.addResultHolder(new ResultHolder(transactionHolder, result)); return createResponse(resultId, result.keys()); } @@ -62,7 +59,7 @@ public CompletionStage processAsync(TestkitState testkitState) .getTransaction() .runAsync(data.getCypher(), data.getParams() != null ? data.getParams() : Collections.emptyMap()) .thenApply(resultCursor -> { - String resultId = + var resultId = testkitState.addAsyncResultHolder(new ResultCursorHolder(transactionHolder, resultCursor)); return createResponse(resultId, resultCursor.keys()); })); @@ -72,10 +69,10 @@ public CompletionStage processAsync(TestkitState testkitState) @SuppressWarnings("deprecation") public Mono processRx(TestkitState testkitState) { return testkitState.getRxTransactionHolder(data.getTxId()).flatMap(transactionHolder -> { - RxResult result = transactionHolder + var result = transactionHolder .getTransaction() .run(data.getCypher(), data.getParams() != null ? data.getParams() : Collections.emptyMap()); - String resultId = testkitState.addRxResultHolder(new RxResultHolder(transactionHolder, result)); + var resultId = testkitState.addRxResultHolder(new RxResultHolder(transactionHolder, result)); // The keys() method causes RUN message exchange. // However, it does not currently report errors. return Mono.fromDirect(result.keys()).map(keys -> createResponse(resultId, keys)); @@ -85,12 +82,12 @@ public Mono processRx(TestkitState testkitState) { @Override public Mono processReactive(TestkitState testkitState) { return testkitState.getReactiveTransactionHolder(data.getTxId()).flatMap(transactionHolder -> { - ReactiveTransaction tx = transactionHolder.getTransaction(); + var tx = transactionHolder.getTransaction(); Map params = data.getParams() != null ? data.getParams() : Collections.emptyMap(); return Mono.fromDirect(flowPublisherToFlux(tx.run(data.getCypher(), params))) .map(result -> { - String id = testkitState.addReactiveResultHolder( + var id = testkitState.addReactiveResultHolder( new ReactiveResultHolder(transactionHolder, result)); return createResponse(id, result.keys()); }); @@ -104,7 +101,7 @@ public Mono processReactiveStreams(TestkitState testkitState) { Map params = data.getParams() != null ? data.getParams() : Collections.emptyMap(); return Mono.fromDirect(tx.run(data.getCypher(), params)).map(result -> { - String id = testkitState.addReactiveResultStreamsHolder( + var id = testkitState.addReactiveResultStreamsHolder( new ReactiveResultStreamsHolder(transactionHolder, result)); return createResponse(id, result.keys()); }); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/VerifyConnectivity.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/VerifyConnectivity.java index 0789911895..a8bee164c8 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/VerifyConnectivity.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/VerifyConnectivity.java @@ -33,14 +33,14 @@ public class VerifyConnectivity implements TestkitRequest { @Override public TestkitResponse process(TestkitState testkitState) { - String id = data.getDriverId(); + var id = data.getDriverId(); testkitState.getDriverHolder(id).getDriver().verifyConnectivity(); return createResponse(id); } @Override public CompletionStage processAsync(TestkitState testkitState) { - String id = data.getDriverId(); + var id = data.getDriverId(); return testkitState .getDriverHolder(id) .getDriver() diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDateDeserializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDateDeserializer.java index c4a37329e8..dab4f0fce4 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDateDeserializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDateDeserializer.java @@ -41,7 +41,7 @@ public TestkitCypherDateDeserializer() { public LocalDate deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - CypherDateData data = mapper.mapData(p, ctxt, new CypherDateData()); + var data = mapper.mapData(p, ctxt, new CypherDateData()); return LocalDate.of(data.year, data.month, data.day); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDateTimeDeserializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDateTimeDeserializer.java index 936592ad90..e21b3c1f19 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDateTimeDeserializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDateTimeDeserializer.java @@ -40,7 +40,7 @@ public TestkitCypherDateTimeDeserializer() { @Override public CypherDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - CypherDateTimeData data = mapper.mapData(p, ctxt, new CypherDateTimeData()); + var data = mapper.mapData(p, ctxt, new CypherDateTimeData()); return new CypherDateTime( data.year, data.month, diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDurationDeserializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDurationDeserializer.java index 30d9fe32bf..858a9398a4 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDurationDeserializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherDurationDeserializer.java @@ -40,7 +40,7 @@ public TestkitCypherDurationDeserializer() { public IsoDuration deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - CypherDurationData data = mapper.mapData(p, ctxt, new CypherDurationData()); + var data = mapper.mapData(p, ctxt, new CypherDurationData()); return new InternalIsoDuration(data.months, data.days, data.seconds, data.nanoseconds); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherParamDeserializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherParamDeserializer.java index 92e2d9eb49..d1963c9a47 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherParamDeserializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherParamDeserializer.java @@ -53,7 +53,7 @@ public Map deserialize(JsonParser p, DeserializationContext ctxt if (p.isExpectedStartObjectToken()) { key = p.nextFieldName(); } else { - JsonToken t = p.getCurrentToken(); + var t = p.getCurrentToken(); if (t == JsonToken.END_OBJECT) { return Collections.emptyMap(); } @@ -67,10 +67,10 @@ public Map deserialize(JsonParser p, DeserializationContext ctxt String paramType = null; if (p.nextToken() == JsonToken.START_OBJECT) { - String fieldName = p.nextFieldName(); + var fieldName = p.nextFieldName(); if (fieldName.equals("name")) { paramType = p.nextTextValue(); - Class mapValueType = cypherTypeToJavaType(paramType); + var mapValueType = cypherTypeToJavaType(paramType); p.nextFieldName(); // next is data which we can drop p.nextToken(); p.nextToken(); @@ -82,7 +82,7 @@ public Map deserialize(JsonParser p, DeserializationContext ctxt { result.put(key, deserialize(p, ctxt)); } else { - Object obj = p.readValueAs(mapValueType); + var obj = p.readValueAs(mapValueType); if (obj instanceof CypherType) { obj = ((CypherType) obj).asValue(); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherTimeDeserializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherTimeDeserializer.java index 4c8f6b07f1..24716404de 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherTimeDeserializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherTimeDeserializer.java @@ -40,7 +40,7 @@ public TestkitCypherTimeDeserializer() { @Override public CypherTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - CypherTimeData data = mapper.mapData(p, ctxt, new CypherTimeData()); + var data = mapper.mapData(p, ctxt, new CypherTimeData()); return new CypherTime(data.hour, data.minute, data.second, data.nanosecond, data.utc_offset_s); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherTypeMapper.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherTypeMapper.java index ee97479391..5b84d901c3 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherTypeMapper.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitCypherTypeMapper.java @@ -23,18 +23,17 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import java.lang.reflect.Field; public class TestkitCypherTypeMapper { public TestkitCypherTypeMapper() {} public T mapData(JsonParser p, DeserializationContext ctxt, T data) throws IOException, JacksonException { - JsonToken token = p.currentToken(); + var token = p.currentToken(); while (token == JsonToken.FIELD_NAME || token == JsonToken.VALUE_NUMBER_INT || token == JsonToken.VALUE_STRING) { if (token == JsonToken.VALUE_NUMBER_INT) { - String field = p.getCurrentName(); + var field = p.getCurrentName(); if (fieldIsType(data, field, Long.class)) { setField(data, field, p.getLongValue()); } else if (fieldIsType(data, field, Integer.class)) { @@ -43,8 +42,8 @@ public T mapData(JsonParser p, DeserializationContext ctxt, T data) throws I throw new RuntimeException("Unhandled field type: " + field); } } else if (token == JsonToken.VALUE_STRING) { - String field = p.getCurrentName(); - String value = p.getValueAsString(); + var field = p.getCurrentName(); + var value = p.getValueAsString(); setField(data, field, value); } token = p.nextToken(); @@ -54,7 +53,7 @@ public T mapData(JsonParser p, DeserializationContext ctxt, T data) throws I private boolean fieldIsType(Object data, String field, Class type) { try { - Field f = data.getClass().getDeclaredField(field); + var f = data.getClass().getDeclaredField(field); return f.getType().equals(type); } catch (NoSuchFieldException e) { return false; @@ -63,7 +62,7 @@ private boolean fieldIsType(Object data, String field, Class type) { private void setField(Object data, String fieldName, Object value) { try { - Field field = data.getClass().getDeclaredField(fieldName); + var field = data.getClass().getDeclaredField(fieldName); field.set(data, value); } catch (NoSuchFieldException | IllegalAccessException e) { throw new RuntimeException(String.format( diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitListDeserializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitListDeserializer.java index 4f412a28b6..76851f5e72 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitListDeserializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/TestkitListDeserializer.java @@ -46,7 +46,7 @@ public TestkitListDeserializer() { public List deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { List result = new ArrayList<>(); - JsonToken t = p.getCurrentToken(); + var t = p.getCurrentToken(); if (t == JsonToken.END_OBJECT) { return result; } @@ -54,7 +54,7 @@ public List deserialize(JsonParser p, DeserializationContext ctxt) throws IOE ctxt.reportWrongTokenException(this, JsonToken.FIELD_NAME, null); } - JsonToken nextToken = p.nextToken(); + var nextToken = p.nextToken(); // standard list if (nextToken == JsonToken.VALUE_STRING) { @@ -70,10 +70,10 @@ public List deserialize(JsonParser p, DeserializationContext ctxt) throws IOE String paramType = null; if (nextToken == JsonToken.START_OBJECT) { - String fieldName = p.nextFieldName(); + var fieldName = p.nextFieldName(); if (fieldName.equals("name")) { paramType = p.nextTextValue(); - Class mapValueType = cypherTypeToJavaType(paramType); + var mapValueType = cypherTypeToJavaType(paramType); p.nextFieldName(); // next is data which we can drop p.nextToken(); p.nextToken(); @@ -85,7 +85,7 @@ public List deserialize(JsonParser p, DeserializationContext ctxt) throws IOE { result.add(mapDeserializer.deserialize(p, ctxt)); } else { - Object obj = p.readValueAs(mapValueType); + var obj = p.readValueAs(mapValueType); if (obj instanceof CypherType) { obj = ((CypherType) obj).asValue(); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/types/CypherDateTime.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/types/CypherDateTime.java index 6706ad79ed..4eed9d1bb4 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/types/CypherDateTime.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/deserializer/types/CypherDateTime.java @@ -55,7 +55,7 @@ public CypherDateTime( @Override public Value asValue() { if (zoneId != null) { - ZonedDateTime dateTime = ZonedDateTime.of(year, month, day, hour, minute, second, nano, ZoneId.of(zoneId)); + var dateTime = ZonedDateTime.of(year, month, day, hour, minute, second, nano, ZoneId.of(zoneId)); if (dateTime.getOffset().getTotalSeconds() != offset) { throw new RuntimeException(String.format( "TestKit's and driver's tz info diverge. " @@ -66,7 +66,7 @@ public Value asValue() { } if (offset != null) { - ZoneOffset zoneOffset = ZoneOffset.ofTotalSeconds(offset); + var zoneOffset = ZoneOffset.ofTotalSeconds(offset); return new DateTimeValue(ZonedDateTime.of(year, month, day, hour, minute, second, nano, zoneOffset)); } return new LocalDateTimeValue(LocalDateTime.of(year, month, day, hour, minute, second, nano)); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NewExpirationBasedAuthTokenManager.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NewExpirationBasedAuthTokenManager.java index a70c62414e..96e7b20d9b 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NewExpirationBasedAuthTokenManager.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NewExpirationBasedAuthTokenManager.java @@ -85,7 +85,7 @@ public CompletionStage get() { private CompletionStage dispatchTestkitCallback( TestkitState testkitState, TestkitCallback response) { - CompletableFuture future = new CompletableFuture<>(); + var future = new CompletableFuture(); testkitState.getCallbackIdToFuture().put(response.getCallbackId(), future); testkitState.getResponseWriter().accept(response); return future; diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/GenUtils.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/GenUtils.java index dd0c7d1515..0db0ed41f4 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/GenUtils.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/GenUtils.java @@ -39,7 +39,7 @@ public static void object(JsonGenerator gen, RunnableWithIOException runnable) t public static void list(JsonGenerator gen, List list) throws IOException { gen.writeStartArray(); - for (T element : list) { + for (var element : list) { gen.writeObject(element); } gen.writeEndArray(); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDateTimeValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDateTimeValueSerializer.java index 80f422e1e6..57085eccf4 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDateTimeValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDateTimeValueSerializer.java @@ -25,9 +25,6 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.io.Serial; -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; import org.neo4j.driver.internal.value.DateTimeValue; public class TestkitDateTimeValueSerializer extends StdSerializer { @@ -41,13 +38,13 @@ public TestkitDateTimeValueSerializer() { @Override public void serialize(DateTimeValue timeValue, JsonGenerator gen, SerializerProvider provider) throws IOException { cypherObject(gen, "CypherDateTime", () -> { - ZonedDateTime dateTime = timeValue.asZonedDateTime(); + var dateTime = timeValue.asZonedDateTime(); GenUtils.writeDate(gen, dateTime.getYear(), dateTime.getMonthValue(), dateTime.getDayOfMonth()); GenUtils.writeTime(gen, dateTime.getHour(), dateTime.getMinute(), dateTime.getSecond(), dateTime.getNano()); - ZoneOffset offset = dateTime.getOffset(); + var offset = dateTime.getOffset(); gen.writeFieldName("utc_offset_s"); gen.writeNumber(offset.getTotalSeconds()); - ZoneId zoneId = dateTime.getZone(); + var zoneId = dateTime.getZone(); if (zoneId != offset) { // not fixed offset gen.writeFieldName("timezone_id"); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDateValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDateValueSerializer.java index 7453177776..051b6277f5 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDateValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDateValueSerializer.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.io.Serial; -import java.time.LocalDate; import org.neo4j.driver.internal.value.DateValue; public class TestkitDateValueSerializer extends StdSerializer { @@ -39,7 +38,7 @@ public TestkitDateValueSerializer() { @Override public void serialize(DateValue dateValue, JsonGenerator gen, SerializerProvider provider) throws IOException { cypherObject(gen, "CypherDate", () -> { - LocalDate date = dateValue.asLocalDate(); + var date = dateValue.asLocalDate(); GenUtils.writeDate(gen, date.getYear(), date.getMonthValue(), date.getDayOfMonth()); }); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDurationValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDurationValueSerializer.java index 61198bccea..d62d05c8f0 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDurationValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitDurationValueSerializer.java @@ -26,7 +26,6 @@ import java.io.IOException; import java.io.Serial; import org.neo4j.driver.internal.value.DurationValue; -import org.neo4j.driver.types.IsoDuration; public class TestkitDurationValueSerializer extends StdSerializer { @Serial @@ -40,7 +39,7 @@ public TestkitDurationValueSerializer() { public void serialize(DurationValue durationValue, JsonGenerator gen, SerializerProvider provider) throws IOException { cypherObject(gen, "CypherDuration", () -> { - IsoDuration duration = durationValue.asIsoDuration(); + var duration = durationValue.asIsoDuration(); gen.writeFieldName("months"); gen.writeNumber(duration.months()); gen.writeFieldName("days"); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitLocalDateTimeValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitLocalDateTimeValueSerializer.java index d4168fae15..08f182b00d 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitLocalDateTimeValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitLocalDateTimeValueSerializer.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.io.Serial; -import java.time.LocalDateTime; import org.neo4j.driver.internal.value.LocalDateTimeValue; public class TestkitLocalDateTimeValueSerializer extends StdSerializer { @@ -40,7 +39,7 @@ public TestkitLocalDateTimeValueSerializer() { public void serialize(LocalDateTimeValue timeValue, JsonGenerator gen, SerializerProvider provider) throws IOException { cypherObject(gen, "CypherDateTime", () -> { - LocalDateTime dateTime = timeValue.asLocalDateTime(); + var dateTime = timeValue.asLocalDateTime(); GenUtils.writeDate(gen, dateTime.getYear(), dateTime.getMonthValue(), dateTime.getDayOfMonth()); GenUtils.writeTime(gen, dateTime.getHour(), dateTime.getMinute(), dateTime.getSecond(), dateTime.getNano()); }); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitLocalTimeValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitLocalTimeValueSerializer.java index 6ed7d43d26..b3c3927d9c 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitLocalTimeValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitLocalTimeValueSerializer.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.io.Serial; -import java.time.LocalTime; import org.neo4j.driver.internal.value.LocalTimeValue; public class TestkitLocalTimeValueSerializer extends StdSerializer { @@ -39,7 +38,7 @@ public TestkitLocalTimeValueSerializer() { @Override public void serialize(LocalTimeValue timeValue, JsonGenerator gen, SerializerProvider provider) throws IOException { cypherObject(gen, "CypherTime", () -> { - LocalTime time = timeValue.asLocalTime(); + var time = timeValue.asLocalTime(); GenUtils.writeTime(gen, time.getHour(), time.getMinute(), time.getSecond(), time.getNano()); }); } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitMapValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitMapValueSerializer.java index c4c4d88fa0..1b6f048342 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitMapValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitMapValueSerializer.java @@ -26,9 +26,7 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.io.Serial; -import java.util.Map; import java.util.function.Function; -import org.neo4j.driver.Value; import org.neo4j.driver.internal.value.MapValue; public class TestkitMapValueSerializer extends StdSerializer { @@ -45,8 +43,7 @@ public void serialize(MapValue mapValue, JsonGenerator gen, SerializerProvider s cypherObject(gen, "CypherMap", () -> { gen.writeFieldName("value"); object(gen, () -> { - for (Map.Entry entry : - mapValue.asMap(Function.identity()).entrySet()) { + for (var entry : mapValue.asMap(Function.identity()).entrySet()) { gen.writeObjectField(entry.getKey(), entry.getValue()); } }); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitNodeValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitNodeValueSerializer.java index 1c1ce64bb3..6a35e784bc 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitNodeValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitNodeValueSerializer.java @@ -33,7 +33,6 @@ import org.neo4j.driver.internal.value.MapValue; import org.neo4j.driver.internal.value.NodeValue; import org.neo4j.driver.internal.value.StringValue; -import org.neo4j.driver.types.Node; public class TestkitNodeValueSerializer extends StdSerializer { @Serial @@ -49,11 +48,11 @@ public void serialize(NodeValue nodeValue, JsonGenerator gen, SerializerProvider throws IOException { cypherObject(gen, "Node", () -> { - Node node = nodeValue.asNode(); + var node = nodeValue.asNode(); gen.writeObjectField("id", new IntegerValue(getId(node::id))); gen.writeObjectField("elementId", new StringValue(node.elementId())); - StringValue[] labels = StreamSupport.stream(node.labels().spliterator(), false) + var labels = StreamSupport.stream(node.labels().spliterator(), false) .map(StringValue::new) .toArray(StringValue[]::new); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitPathValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitPathValueSerializer.java index 30fe5e1c95..499e524646 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitPathValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitPathValueSerializer.java @@ -30,7 +30,6 @@ import org.neo4j.driver.internal.value.NodeValue; import org.neo4j.driver.internal.value.PathValue; import org.neo4j.driver.internal.value.RelationshipValue; -import org.neo4j.driver.types.Path; public class TestkitPathValueSerializer extends StdSerializer { @Serial @@ -43,13 +42,12 @@ public TestkitPathValueSerializer() { @Override public void serialize(PathValue pathValue, JsonGenerator gen, SerializerProvider provider) throws IOException { cypherObject(gen, "Path", () -> { - Path path = pathValue.asPath(); - NodeValue[] nodes = StreamSupport.stream(path.nodes().spliterator(), false) + var path = pathValue.asPath(); + var nodes = StreamSupport.stream(path.nodes().spliterator(), false) .map(NodeValue::new) .toArray(NodeValue[]::new); gen.writeObjectField("nodes", new ListValue(nodes)); - RelationshipValue[] relationships = StreamSupport.stream( - path.relationships().spliterator(), false) + var relationships = StreamSupport.stream(path.relationships().spliterator(), false) .map(RelationshipValue::new) .toArray(RelationshipValue[]::new); gen.writeObjectField("relationships", new ListValue(relationships)); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitRelationshipValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitRelationshipValueSerializer.java index 0599bf1c21..fc7d68794c 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitRelationshipValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitRelationshipValueSerializer.java @@ -31,7 +31,6 @@ import org.neo4j.driver.internal.value.MapValue; import org.neo4j.driver.internal.value.RelationshipValue; import org.neo4j.driver.internal.value.StringValue; -import org.neo4j.driver.types.Relationship; public class TestkitRelationshipValueSerializer extends StdSerializer { @Serial @@ -46,7 +45,7 @@ public TestkitRelationshipValueSerializer() { public void serialize(RelationshipValue relationshipValue, JsonGenerator gen, SerializerProvider provider) throws IOException { cypherObject(gen, "Relationship", () -> { - Relationship relationship = relationshipValue.asRelationship(); + var relationship = relationshipValue.asRelationship(); gen.writeObjectField("id", new IntegerValue(getId(relationship::id))); gen.writeObjectField("elementId", new StringValue(relationship.elementId())); gen.writeObjectField("startNodeId", new IntegerValue(getId(relationship::startNodeId))); diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitTimeValueSerializer.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitTimeValueSerializer.java index d8bd5b2403..30e62dd537 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitTimeValueSerializer.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/serializer/TestkitTimeValueSerializer.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.io.Serial; -import java.time.OffsetTime; import org.neo4j.driver.internal.value.TimeValue; public class TestkitTimeValueSerializer extends StdSerializer { @@ -39,7 +38,7 @@ public TestkitTimeValueSerializer() { @Override public void serialize(TimeValue timeValue, JsonGenerator gen, SerializerProvider provider) throws IOException { cypherObject(gen, "CypherTime", () -> { - OffsetTime time = timeValue.asOffsetTime(); + var time = timeValue.asOffsetTime(); GenUtils.writeTime(gen, time.getHour(), time.getMinute(), time.getSecond(), time.getNano()); gen.writeFieldName("utc_offset_s"); gen.writeNumber(time.getOffset().getTotalSeconds()); diff --git a/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageDeserializerTest.java b/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageDeserializerTest.java index f6e6744cf0..9c15c295b1 100644 --- a/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageDeserializerTest.java +++ b/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageDeserializerTest.java @@ -44,7 +44,7 @@ void testDeserializeNewDriver() throws JsonProcessingException { assertThat(message, instanceOf(NewDriver.class)); - NewDriver newDriver = (NewDriver) message; + var newDriver = (NewDriver) message; assertThat(newDriver.getData().getUri(), equalTo("bolt://localhost:7687")); assertThat(newDriver.getData().getAuthorizationToken().getTokens().getScheme(), equalTo("basic")); assertThat(newDriver.getData().getAuthorizationToken().getTokens().getPrincipal(), equalTo("neo4j")); @@ -59,7 +59,7 @@ void testDeserializerNewSession() throws JsonProcessingException { assertThat(message, instanceOf(NewSession.class)); - NewSession sessionRequest = (NewSession) message; + var sessionRequest = (NewSession) message; assertThat(sessionRequest.getData().getDriverId(), equalTo("0")); assertThat(sessionRequest.getData().getAccessMode(), equalTo("w")); } @@ -73,7 +73,7 @@ void testDeserializerNewSessionRun() throws JsonProcessingException { assertThat(message, instanceOf(SessionRun.class)); - SessionRun sessionRun = (SessionRun) message; + var sessionRun = (SessionRun) message; assertThat(sessionRun.getData().getSessionId(), equalTo("1")); assertThat(sessionRun.getData().getCypher(), equalTo("RETURN $x as y")); } diff --git a/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageSerializerTest.java b/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageSerializerTest.java index 7f572d7bb6..2492b98c77 100644 --- a/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageSerializerTest.java +++ b/testkit-backend/src/test/java/neo4j/org/testkit/backend/MessageSerializerTest.java @@ -32,12 +32,12 @@ public class MessageSerializerTest { @Test void shouldSerializerNewDriverResponse() throws JsonProcessingException { - Driver response = Driver.builder() + var response = Driver.builder() .data(Driver.DriverBody.builder().id("1").build()) .build(); - String expectedOutput = "{\"name\":\"Driver\",\"data\":{\"id\":\"1\"}}"; + var expectedOutput = "{\"name\":\"Driver\",\"data\":{\"id\":\"1\"}}"; - String serializedResponse = mapper.writeValueAsString(response); + var serializedResponse = mapper.writeValueAsString(response); assertThat(serializedResponse, equalTo(expectedOutput)); }