diff --git a/driver/src/main/java/org/neo4j/driver/internal/handlers/InitResponseHandler.java b/driver/src/main/java/org/neo4j/driver/internal/handlers/InitResponseHandler.java deleted file mode 100644 index 9f196cedeb..0000000000 --- a/driver/src/main/java/org/neo4j/driver/internal/handlers/InitResponseHandler.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.neo4j.driver.internal.handlers; - -import io.netty.channel.Channel; -import io.netty.channel.ChannelPromise; - -import java.util.Map; - -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.UntrustedServerException; -import org.neo4j.driver.internal.spi.ResponseHandler; - -import static org.neo4j.driver.internal.util.MetadataExtractor.extractServer; - -public class InitResponseHandler implements ResponseHandler -{ - private final ChannelPromise connectionInitializedPromise; - private final Channel channel; - - public InitResponseHandler( ChannelPromise connectionInitializedPromise ) - { - this.connectionInitializedPromise = connectionInitializedPromise; - this.channel = connectionInitializedPromise.channel(); - } - - @Override - public void onSuccess( Map metadata ) - { - try - { - String serverAgent = extractServer( metadata ).asString(); - - if ( !serverAgent.startsWith( "Neo4j/" ) ) - { - throw new UntrustedServerException( "Server does not identify as a genuine Neo4j instance: '" + serverAgent + "'" ); - } - - connectionInitializedPromise.setSuccess(); - } - catch ( Throwable error ) - { - connectionInitializedPromise.setFailure( error ); - throw error; - } - } - - @Override - public void onFailure( Throwable error ) - { - channel.close().addListener( future -> connectionInitializedPromise.setFailure( error ) ); - } - - @Override - public void onRecord( Value[] fields ) - { - throw new UnsupportedOperationException(); - } -} diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/encode/InitMessageEncoder.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/encode/InitMessageEncoder.java deleted file mode 100644 index a0431f1d04..0000000000 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/encode/InitMessageEncoder.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.neo4j.driver.internal.messaging.encode; - -import java.io.IOException; - -import org.neo4j.driver.internal.messaging.Message; -import org.neo4j.driver.internal.messaging.MessageEncoder; -import org.neo4j.driver.internal.messaging.ValuePacker; -import org.neo4j.driver.internal.messaging.request.InitMessage; - -import static org.neo4j.driver.internal.util.Preconditions.checkArgument; - -public class InitMessageEncoder implements MessageEncoder -{ - @Override - public void encode( Message message, ValuePacker packer ) throws IOException - { - checkArgument( message, InitMessage.class ); - InitMessage initMessage = (InitMessage) message; - packer.packStructHeader( 2, initMessage.signature() ); - packer.pack( initMessage.userAgent() ); - packer.pack( initMessage.authToken() ); - } -} diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/encode/RunMessageEncoder.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/encode/RunMessageEncoder.java deleted file mode 100644 index bab8ff689a..0000000000 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/encode/RunMessageEncoder.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.neo4j.driver.internal.messaging.encode; - -import java.io.IOException; - -import org.neo4j.driver.internal.messaging.Message; -import org.neo4j.driver.internal.messaging.MessageEncoder; -import org.neo4j.driver.internal.messaging.ValuePacker; -import org.neo4j.driver.internal.messaging.request.RunMessage; - -import static org.neo4j.driver.internal.util.Preconditions.checkArgument; - -public class RunMessageEncoder implements MessageEncoder -{ - @Override - public void encode( Message message, ValuePacker packer ) throws IOException - { - checkArgument( message, RunMessage.class ); - RunMessage runMessage = (RunMessage) message; - packer.packStructHeader( 2, runMessage.signature() ); - packer.pack( runMessage.query() ); - packer.pack( runMessage.parameters() ); - } -} diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/request/InitMessage.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/request/InitMessage.java deleted file mode 100644 index 7eaf221c47..0000000000 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/request/InitMessage.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.neo4j.driver.internal.messaging.request; - -import java.util.Map; - -import org.neo4j.driver.internal.messaging.Message; -import org.neo4j.driver.Value; - -import static java.lang.String.format; - -/** - * INIT request message - *

- * Sent by clients to initialize a new connection. Must be sent as the very first message after protocol negotiation. - */ -public class InitMessage implements Message -{ - public final static byte SIGNATURE = 0x01; - - private final String userAgent; - private Map authToken; - - public InitMessage( String userAgent, Map authToken ) - { - this.userAgent = userAgent; - this.authToken = authToken; - } - - public String userAgent() - { - return userAgent; - } - - public Map authToken() - { - return authToken; - } - - @Override - public byte signature() - { - return SIGNATURE; - } - - @Override - public String toString() - { - return format( "INIT \"%s\" {...}", userAgent ); - } - - @Override - public boolean equals( Object o ) - { - if ( this == o ) - { return true; } - if ( o == null || getClass() != o.getClass() ) - { return false; } - - InitMessage that = (InitMessage) o; - - return !(userAgent != null ? !userAgent.equals( that.userAgent ) - : that.userAgent != null); - - } - - @Override - public int hashCode() - { - return userAgent != null ? userAgent.hashCode() : 0; - } -} diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/request/RunMessage.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/request/RunMessage.java deleted file mode 100644 index bb74f703e2..0000000000 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/request/RunMessage.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.neo4j.driver.internal.messaging.request; - -import java.util.Collections; -import java.util.Map; - -import org.neo4j.driver.internal.messaging.Message; -import org.neo4j.driver.Value; - -import static java.lang.String.format; - -/** - * RUN request message - *

- * Sent by clients to start a new Tank job for a given query and - * parameter set. - */ -public class RunMessage implements Message -{ - public final static byte SIGNATURE = 0x10; - - private final String query; - private final Map parameters; - - public RunMessage( String query) - { - this(query, Collections.emptyMap() ); - } - - public RunMessage(String query, Map parameters ) - { - this.query = query; - this.parameters = parameters; - } - - public String query() - { - return query; - } - - public Map parameters() - { - return parameters; - } - - @Override - public byte signature() - { - return SIGNATURE; - } - - @Override - public String toString() - { - return format( "RUN \"%s\" %s", query, parameters ); - } - - @Override - public boolean equals( Object o ) - { - if ( this == o ) - { - return true; - } - if ( o == null || getClass() != o.getClass() ) - { - return false; - } - - RunMessage that = (RunMessage) o; - - return !(parameters != null ? !parameters.equals( that.parameters ) : that.parameters != null) && - !(query != null ? !query.equals( that.query) : that.query != null); - - } - - @Override - public int hashCode() - { - int result = query != null ? query.hashCode() : 0; - result = 31 * result + (parameters != null ? parameters.hashCode() : 0); - return result; - } -} diff --git a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java index 3b7b10b026..d1794dd84f 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/async/NetworkConnectionTest.java @@ -35,12 +35,13 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; +import org.neo4j.driver.Query; import org.neo4j.driver.internal.BoltServerAddress; import org.neo4j.driver.internal.async.connection.ChannelAttributes; import org.neo4j.driver.internal.async.inbound.InboundMessageDispatcher; import org.neo4j.driver.internal.async.pool.ExtendedChannelPool; import org.neo4j.driver.internal.handlers.NoOpResponseHandler; -import org.neo4j.driver.internal.messaging.request.RunMessage; +import org.neo4j.driver.internal.messaging.request.RunWithMetadataMessage; import org.neo4j.driver.internal.spi.ResponseHandler; import org.neo4j.driver.internal.util.FakeClock; @@ -111,20 +112,23 @@ void shouldSendResetOnRelease() void shouldWriteInEventLoopThread() throws Exception { testWriteInEventLoop( "WriteSingleMessage", - connection -> connection.write( new RunMessage( "RETURN 1" ), NO_OP_HANDLER ) ); + connection -> connection.write( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), NO_OP_HANDLER ) ); testWriteInEventLoop( "WriteMultipleMessages", - connection -> connection.write( new RunMessage( "RETURN 1" ), NO_OP_HANDLER, PULL_ALL, NO_OP_HANDLER ) ); + connection -> connection.write( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), NO_OP_HANDLER, PULL_ALL, + NO_OP_HANDLER ) ); } @Test void shouldWriteAndFlushInEventLoopThread() throws Exception { testWriteInEventLoop( "WriteAndFlushSingleMessage", - connection -> connection.writeAndFlush( new RunMessage( "RETURN 1" ), NO_OP_HANDLER ) ); + connection -> connection.writeAndFlush( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), + NO_OP_HANDLER ) ); testWriteInEventLoop( "WriteAndFlushMultipleMessages", - connection -> connection.writeAndFlush( new RunMessage( "RETURN 1" ), NO_OP_HANDLER, PULL_ALL, NO_OP_HANDLER ) ); + connection -> connection.writeAndFlush( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), NO_OP_HANDLER, + PULL_ALL, NO_OP_HANDLER ) ); } @Test @@ -237,7 +241,7 @@ void shouldNotWriteSingleMessageWhenReleased() NetworkConnection connection = newConnection( newChannel() ); connection.release(); - connection.write( new RunMessage( "RETURN 1" ), handler ); + connection.write( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), handler ); ArgumentCaptor failureCaptor = ArgumentCaptor.forClass( IllegalStateException.class ); verify( handler ).onFailure( failureCaptor.capture() ); @@ -252,7 +256,7 @@ void shouldNotWriteMultipleMessagesWhenReleased() NetworkConnection connection = newConnection( newChannel() ); connection.release(); - connection.write( new RunMessage( "RETURN 1" ), runHandler, PULL_ALL, pullAllHandler ); + connection.write( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), runHandler, PULL_ALL, pullAllHandler ); ArgumentCaptor failureCaptor = ArgumentCaptor.forClass( IllegalStateException.class ); verify( runHandler ).onFailure( failureCaptor.capture() ); @@ -266,7 +270,7 @@ void shouldNotWriteAndFlushSingleMessageWhenReleased() NetworkConnection connection = newConnection( newChannel() ); connection.release(); - connection.writeAndFlush( new RunMessage( "RETURN 1" ), handler ); + connection.writeAndFlush( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), handler ); ArgumentCaptor failureCaptor = ArgumentCaptor.forClass( IllegalStateException.class ); verify( handler ).onFailure( failureCaptor.capture() ); @@ -281,7 +285,7 @@ void shouldNotWriteAndFlushMultipleMessagesWhenReleased() NetworkConnection connection = newConnection( newChannel() ); connection.release(); - connection.writeAndFlush( new RunMessage( "RETURN 1" ), runHandler, PULL_ALL, pullAllHandler ); + connection.writeAndFlush( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), runHandler, PULL_ALL, pullAllHandler ); ArgumentCaptor failureCaptor = ArgumentCaptor.forClass( IllegalStateException.class ); verify( runHandler ).onFailure( failureCaptor.capture() ); @@ -295,7 +299,7 @@ void shouldNotWriteSingleMessageWhenTerminated() NetworkConnection connection = newConnection( newChannel() ); connection.terminateAndRelease( "42" ); - connection.write( new RunMessage( "RETURN 1" ), handler ); + connection.write( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), handler ); ArgumentCaptor failureCaptor = ArgumentCaptor.forClass( IllegalStateException.class ); verify( handler ).onFailure( failureCaptor.capture() ); @@ -310,7 +314,7 @@ void shouldNotWriteMultipleMessagesWhenTerminated() NetworkConnection connection = newConnection( newChannel() ); connection.terminateAndRelease( "42" ); - connection.write( new RunMessage( "RETURN 1" ), runHandler, PULL_ALL, pullAllHandler ); + connection.write( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), runHandler, PULL_ALL, pullAllHandler ); ArgumentCaptor failureCaptor = ArgumentCaptor.forClass( IllegalStateException.class ); verify( runHandler ).onFailure( failureCaptor.capture() ); @@ -324,7 +328,7 @@ void shouldNotWriteAndFlushSingleMessageWhenTerminated() NetworkConnection connection = newConnection( newChannel() ); connection.terminateAndRelease( "42" ); - connection.writeAndFlush( new RunMessage( "RETURN 1" ), handler ); + connection.writeAndFlush( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), handler ); ArgumentCaptor failureCaptor = ArgumentCaptor.forClass( IllegalStateException.class ); verify( handler ).onFailure( failureCaptor.capture() ); @@ -339,7 +343,7 @@ void shouldNotWriteAndFlushMultipleMessagesWhenTerminated() NetworkConnection connection = newConnection( newChannel() ); connection.terminateAndRelease( "42" ); - connection.writeAndFlush( new RunMessage( "RETURN 1" ), runHandler, PULL_ALL, pullAllHandler ); + connection.writeAndFlush( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 1" ) ), runHandler, PULL_ALL, pullAllHandler ); ArgumentCaptor failureCaptor = ArgumentCaptor.forClass( IllegalStateException.class ); verify( runHandler ).onFailure( failureCaptor.capture() ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/handlers/InitResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/handlers/InitResponseHandlerTest.java deleted file mode 100644 index 2a894e5a2e..0000000000 --- a/driver/src/test/java/org/neo4j/driver/internal/handlers/InitResponseHandlerTest.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.neo4j.driver.internal.handlers; - -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.ChannelPromise; -import io.netty.channel.embedded.EmbeddedChannel; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import org.neo4j.driver.Query; -import org.neo4j.driver.Value; -import org.neo4j.driver.Values; -import org.neo4j.driver.exceptions.UntrustedServerException; -import org.neo4j.driver.internal.async.inbound.ChannelErrorHandler; -import org.neo4j.driver.internal.async.inbound.InboundMessageDispatcher; -import org.neo4j.driver.internal.async.outbound.OutboundMessageHandler; -import org.neo4j.driver.internal.messaging.v3.MessageFormatV3; - -import static java.util.Collections.singletonMap; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.neo4j.driver.Values.value; -import static org.neo4j.driver.internal.async.connection.ChannelAttributes.setMessageDispatcher; -import static org.neo4j.driver.internal.async.outbound.OutboundMessageHandler.NAME; -import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING; - -class InitResponseHandlerTest -{ - private final EmbeddedChannel channel = new EmbeddedChannel(); - - @BeforeEach - void setUp() - { - setMessageDispatcher( channel, new InboundMessageDispatcher( channel, DEV_NULL_LOGGING ) ); - ChannelPipeline pipeline = channel.pipeline(); - pipeline.addLast( NAME, new OutboundMessageHandler( new MessageFormatV3(), DEV_NULL_LOGGING ) ); - pipeline.addLast( new ChannelErrorHandler( DEV_NULL_LOGGING ) ); - } - - @AfterEach - void tearDown() - { - channel.finishAndReleaseAll(); - } - - @Test - void shouldFailToConnectWhenNoServerIdentifierIsProvided() - { - ChannelPromise channelPromise = channel.newPromise(); - InitResponseHandler handler = new InitResponseHandler( channelPromise ); - - Map metadata = singletonMap( "server", Values.NULL ); - assertThrows( UntrustedServerException.class, () -> handler.onSuccess( metadata ) ); - } - - @Test - void shouldAllowByteArrays() - { - InitResponseHandler handler = new InitResponseHandler( channel.newPromise() ); - - Map metadata = singletonMap( "server", value( "Neo4j/4.4.0" ) ); - handler.onSuccess( metadata ); - - Map params = singletonMap( "array", value( new byte[]{1, 2, 3} ) ); - assertTrue( channel.writeOutbound( new Query( "RETURN 1", Values.value( params ) ) ) ); - assertTrue( channel.finish() ); - } - - @Test - void shouldCloseChannelOnFailure() throws Exception - { - ChannelPromise channelPromise = channel.newPromise(); - InitResponseHandler handler = new InitResponseHandler( channelPromise ); - - RuntimeException error = new RuntimeException( "Hi!" ); - handler.onFailure( error ); - - ChannelFuture channelCloseFuture = channel.closeFuture(); - channelCloseFuture.await( 5, TimeUnit.SECONDS ); - - assertTrue( channelCloseFuture.isSuccess() ); - assertTrue( channelPromise.isDone() ); - assertEquals( error, channelPromise.cause() ); - } -} diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java index 179c15e795..109045f867 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java @@ -21,13 +21,11 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; -import io.netty.handler.codec.EncoderException; import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.HashMap; import java.util.List; -import java.util.Map; import org.neo4j.driver.Value; import org.neo4j.driver.exceptions.ClientException; @@ -36,7 +34,6 @@ import org.neo4j.driver.internal.async.inbound.InboundMessageDispatcher; import org.neo4j.driver.internal.async.outbound.ChunkAwareByteBufOutput; import org.neo4j.driver.internal.messaging.common.CommonValueUnpacker; -import org.neo4j.driver.internal.messaging.request.InitMessage; import org.neo4j.driver.internal.messaging.response.FailureMessage; import org.neo4j.driver.internal.messaging.response.IgnoredMessage; import org.neo4j.driver.internal.messaging.response.RecordMessage; @@ -47,9 +44,6 @@ import org.neo4j.driver.internal.util.messaging.MemorizingInboundMessageDispatcher; import static java.util.Arrays.asList; -import static java.util.Collections.singletonMap; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -206,17 +200,4 @@ private ByteBuf knowledgeablePack( Message message ) throws IOException return Unpooled.wrappedBuffer( packedMessages ); } - - private void expectIOExceptionWithMessage( Value value, String errorMessage ) - { - Map metadata = singletonMap( "relationship", value ); - InitMessage message = new InitMessage( "Hello", metadata ); - EmbeddedChannel channel = newEmbeddedChannel(); - - EncoderException error = assertThrows( EncoderException.class, () -> pack( message, channel ) ); - Throwable cause = error.getCause(); - assertThat( cause, instanceOf( IOException.class ) ); - assertThat( cause.getMessage(), equalTo( errorMessage ) ); - } - } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/InitMessageEncoderTest.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/InitMessageEncoderTest.java deleted file mode 100644 index 8156503048..0000000000 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/InitMessageEncoderTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.neo4j.driver.internal.messaging.encode; - -import org.junit.jupiter.api.Test; -import org.mockito.InOrder; - -import java.util.HashMap; -import java.util.Map; - -import org.neo4j.driver.internal.messaging.ValuePacker; -import org.neo4j.driver.internal.messaging.request.InitMessage; -import org.neo4j.driver.internal.messaging.request.PullAllMessage; -import org.neo4j.driver.Value; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.neo4j.driver.Values.value; - -class InitMessageEncoderTest -{ - private final InitMessageEncoder encoder = new InitMessageEncoder(); - private final ValuePacker packer = mock( ValuePacker.class ); - - @Test - void shouldEncodeInitMessage() throws Exception - { - Map authToken = new HashMap<>(); - authToken.put( "username", value( "bob" ) ); - authToken.put( "password", value( "secret" ) ); - - encoder.encode( new InitMessage( "MyDriver", authToken ), packer ); - - InOrder order = inOrder( packer ); - order.verify( packer ).packStructHeader( 2, InitMessage.SIGNATURE ); - order.verify( packer ).pack( "MyDriver" ); - order.verify( packer ).pack( authToken ); - } - - @Test - void shouldFailToEncodeWrongMessage() - { - assertThrows( IllegalArgumentException.class, () -> encoder.encode( PullAllMessage.PULL_ALL, packer ) ); - } -} diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/ResetMessageEncoderTest.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/ResetMessageEncoderTest.java index aadaff20d9..685e4122cc 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/ResetMessageEncoderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/ResetMessageEncoderTest.java @@ -20,9 +20,10 @@ import org.junit.jupiter.api.Test; +import org.neo4j.driver.Query; import org.neo4j.driver.internal.messaging.ValuePacker; import org.neo4j.driver.internal.messaging.request.ResetMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; +import org.neo4j.driver.internal.messaging.request.RunWithMetadataMessage; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; @@ -44,6 +45,6 @@ void shouldEncodeResetMessage() throws Exception @Test void shouldFailToEncodeWrongMessage() { - assertThrows( IllegalArgumentException.class, () -> encoder.encode( new RunMessage( "RETURN 2" ), packer ) ); + assertThrows( IllegalArgumentException.class, () -> encoder.encode( RunWithMetadataMessage.unmanagedTxRunMessage( new Query( "RETURN 2" ) ), packer ) ); } } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/RunMessageEncoderTest.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/RunMessageEncoderTest.java deleted file mode 100644 index 996c9b6412..0000000000 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/encode/RunMessageEncoderTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) "Neo4j" - * Neo4j Sweden AB [http://neo4j.com] - * - * This file is part of Neo4j. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.neo4j.driver.internal.messaging.encode; - -import org.junit.jupiter.api.Test; -import org.mockito.InOrder; - -import java.util.Map; - -import org.neo4j.driver.internal.messaging.ValuePacker; -import org.neo4j.driver.internal.messaging.request.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; -import org.neo4j.driver.Value; - -import static java.util.Collections.singletonMap; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.neo4j.driver.Values.value; - -class RunMessageEncoderTest -{ - private final RunMessageEncoder encoder = new RunMessageEncoder(); - private final ValuePacker packer = mock( ValuePacker.class ); - - @Test - void shouldEncodeRunMessage() throws Exception - { - Map params = singletonMap( "answer", value( 42 ) ); - - encoder.encode( new RunMessage( "RETURN $answer", params ), packer ); - - InOrder order = inOrder( packer ); - order.verify( packer ).packStructHeader( 2, RunMessage.SIGNATURE ); - order.verify( packer ).pack( "RETURN $answer" ); - order.verify( packer ).pack( params ); - } - - @Test - void shouldFailToEncodeWrongMessage() - { - assertThrows( IllegalArgumentException.class, () -> encoder.encode( DiscardAllMessage.DISCARD_ALL, packer ) ); - } -} diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/MessageReaderV3Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/MessageReaderV3Test.java index 3f61b9ccbc..9e2ec0f276 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/MessageReaderV3Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/MessageReaderV3Test.java @@ -35,7 +35,6 @@ import org.neo4j.driver.internal.messaging.Message; import org.neo4j.driver.internal.messaging.MessageFormat; import org.neo4j.driver.internal.messaging.request.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.messaging.response.FailureMessage; import org.neo4j.driver.internal.messaging.response.IgnoredMessage; import org.neo4j.driver.internal.messaging.response.RecordMessage; @@ -102,8 +101,7 @@ protected Stream supportedMessages() protected Stream unsupportedMessages() { return Stream.of( - DiscardAllMessage.DISCARD_ALL, - new RunMessage( "RETURN 42" ) + DiscardAllMessage.DISCARD_ALL ); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/MessageWriterV3Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/MessageWriterV3Test.java index bcfc4a843a..1b399ba610 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/MessageWriterV3Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v3/MessageWriterV3Test.java @@ -34,8 +34,6 @@ import org.neo4j.driver.internal.messaging.MessageFormat; import org.neo4j.driver.internal.messaging.request.BeginMessage; import org.neo4j.driver.internal.messaging.request.HelloMessage; -import org.neo4j.driver.internal.messaging.request.InitMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.packstream.PackOutput; import org.neo4j.driver.internal.security.InternalAuthToken; import org.neo4j.driver.internal.util.messaging.AbstractMessageWriterTestBase; @@ -119,10 +117,6 @@ protected Stream supportedMessages() @Override protected Stream unsupportedMessages() { - return Stream.of( - // Bolt V1 and V2 messages - new InitMessage( "Apa", emptyMap() ), - new RunMessage( "RETURN 1" ) - ); + return Stream.empty(); } } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/MessageReaderV4Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/MessageReaderV4Test.java index ef2f73bf56..3ce6af0a7c 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/MessageReaderV4Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/MessageReaderV4Test.java @@ -35,7 +35,6 @@ import org.neo4j.driver.internal.messaging.Message; import org.neo4j.driver.internal.messaging.MessageFormat; import org.neo4j.driver.internal.messaging.request.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.messaging.response.FailureMessage; import org.neo4j.driver.internal.messaging.response.IgnoredMessage; import org.neo4j.driver.internal.messaging.response.RecordMessage; @@ -102,8 +101,7 @@ protected Stream supportedMessages() protected Stream unsupportedMessages() { return Stream.of( - DiscardAllMessage.DISCARD_ALL, - new RunMessage( "RETURN 42" ) + DiscardAllMessage.DISCARD_ALL ); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/MessageWriterV4Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/MessageWriterV4Test.java index df7cdf858c..fe7decacd5 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/MessageWriterV4Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v4/MessageWriterV4Test.java @@ -35,9 +35,7 @@ import org.neo4j.driver.internal.messaging.request.BeginMessage; import org.neo4j.driver.internal.messaging.request.DiscardMessage; import org.neo4j.driver.internal.messaging.request.HelloMessage; -import org.neo4j.driver.internal.messaging.request.InitMessage; import org.neo4j.driver.internal.messaging.request.PullMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.messaging.v3.BoltProtocolV3; import org.neo4j.driver.internal.packstream.PackOutput; import org.neo4j.driver.internal.security.InternalAuthToken; @@ -129,8 +127,6 @@ protected Stream unsupportedMessages() { return Stream.of( // Bolt V1, V2 and V3 messages - new InitMessage( "Apa", emptyMap() ), - new RunMessage( "RETURN 1" ), PULL_ALL, DISCARD_ALL ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/MessageReaderV41Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/MessageReaderV41Test.java index 88e111e276..0d7f05e759 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/MessageReaderV41Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/MessageReaderV41Test.java @@ -35,7 +35,6 @@ import org.neo4j.driver.internal.messaging.Message; import org.neo4j.driver.internal.messaging.MessageFormat; import org.neo4j.driver.internal.messaging.request.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.messaging.response.FailureMessage; import org.neo4j.driver.internal.messaging.response.IgnoredMessage; import org.neo4j.driver.internal.messaging.response.RecordMessage; @@ -102,8 +101,7 @@ protected Stream supportedMessages() protected Stream unsupportedMessages() { return Stream.of( - DiscardAllMessage.DISCARD_ALL, - new RunMessage( "RETURN 42" ) + DiscardAllMessage.DISCARD_ALL ); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/MessageWriterV41Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/MessageWriterV41Test.java index dc172824cf..86266f9f27 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/MessageWriterV41Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v41/MessageWriterV41Test.java @@ -35,9 +35,7 @@ import org.neo4j.driver.internal.messaging.request.BeginMessage; import org.neo4j.driver.internal.messaging.request.DiscardMessage; import org.neo4j.driver.internal.messaging.request.HelloMessage; -import org.neo4j.driver.internal.messaging.request.InitMessage; import org.neo4j.driver.internal.messaging.request.PullMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.packstream.PackOutput; import org.neo4j.driver.internal.security.InternalAuthToken; import org.neo4j.driver.internal.util.messaging.AbstractMessageWriterTestBase; @@ -128,8 +126,6 @@ protected Stream unsupportedMessages() { return Stream.of( // Bolt V1, V2 and V3 messages - new InitMessage( "Apa", emptyMap() ), - new RunMessage( "RETURN 1" ), PULL_ALL, DISCARD_ALL ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/MessageReaderV42Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/MessageReaderV42Test.java index eb846ffef1..b29b5039d0 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/MessageReaderV42Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/MessageReaderV42Test.java @@ -35,7 +35,6 @@ import org.neo4j.driver.internal.messaging.Message; import org.neo4j.driver.internal.messaging.MessageFormat; import org.neo4j.driver.internal.messaging.request.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.messaging.response.FailureMessage; import org.neo4j.driver.internal.messaging.response.IgnoredMessage; import org.neo4j.driver.internal.messaging.response.RecordMessage; @@ -102,8 +101,7 @@ protected Stream supportedMessages() protected Stream unsupportedMessages() { return Stream.of( - DiscardAllMessage.DISCARD_ALL, - new RunMessage( "RETURN 42" ) + DiscardAllMessage.DISCARD_ALL ); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/MessageWriterV42Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/MessageWriterV42Test.java index 4ce24f8fd6..8ebd7217bd 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/MessageWriterV42Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v42/MessageWriterV42Test.java @@ -35,9 +35,7 @@ import org.neo4j.driver.internal.messaging.request.BeginMessage; import org.neo4j.driver.internal.messaging.request.DiscardMessage; import org.neo4j.driver.internal.messaging.request.HelloMessage; -import org.neo4j.driver.internal.messaging.request.InitMessage; import org.neo4j.driver.internal.messaging.request.PullMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.packstream.PackOutput; import org.neo4j.driver.internal.security.InternalAuthToken; import org.neo4j.driver.internal.util.messaging.AbstractMessageWriterTestBase; @@ -128,8 +126,6 @@ protected Stream unsupportedMessages() { return Stream.of( // Bolt V1, V2 and V3 messages - new InitMessage( "Apa", emptyMap() ), - new RunMessage( "RETURN 1" ), PULL_ALL, DISCARD_ALL ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/MessageReaderV43Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/MessageReaderV43Test.java index c72d171a17..bc6e284799 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/MessageReaderV43Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/MessageReaderV43Test.java @@ -35,7 +35,6 @@ import org.neo4j.driver.internal.messaging.Message; import org.neo4j.driver.internal.messaging.MessageFormat; import org.neo4j.driver.internal.messaging.request.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.messaging.response.FailureMessage; import org.neo4j.driver.internal.messaging.response.IgnoredMessage; import org.neo4j.driver.internal.messaging.response.RecordMessage; @@ -103,8 +102,7 @@ protected Stream supportedMessages() protected Stream unsupportedMessages() { return Stream.of( - DiscardAllMessage.DISCARD_ALL, - new RunMessage( "RETURN 42" ) + DiscardAllMessage.DISCARD_ALL ); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/MessageWriterV43Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/MessageWriterV43Test.java index c8eceeeecb..2f45f29f63 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/MessageWriterV43Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v43/MessageWriterV43Test.java @@ -39,10 +39,8 @@ import org.neo4j.driver.internal.messaging.request.BeginMessage; import org.neo4j.driver.internal.messaging.request.DiscardMessage; import org.neo4j.driver.internal.messaging.request.HelloMessage; -import org.neo4j.driver.internal.messaging.request.InitMessage; import org.neo4j.driver.internal.messaging.request.PullMessage; import org.neo4j.driver.internal.messaging.request.RouteMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.packstream.PackOutput; import org.neo4j.driver.internal.security.InternalAuthToken; import org.neo4j.driver.internal.util.messaging.AbstractMessageWriterTestBase; @@ -136,8 +134,6 @@ protected Stream unsupportedMessages() { return Stream.of( // Bolt V1, V2 and V3 messages - new InitMessage( "Apa", emptyMap() ), - new RunMessage( "RETURN 1" ), PULL_ALL, DISCARD_ALL ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/MessageReaderV44Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/MessageReaderV44Test.java index dd6ee7de80..6f3e93b590 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/MessageReaderV44Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/MessageReaderV44Test.java @@ -35,7 +35,6 @@ import org.neo4j.driver.internal.messaging.Message; import org.neo4j.driver.internal.messaging.MessageFormat; import org.neo4j.driver.internal.messaging.request.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.messaging.response.FailureMessage; import org.neo4j.driver.internal.messaging.response.IgnoredMessage; import org.neo4j.driver.internal.messaging.response.RecordMessage; @@ -101,8 +100,7 @@ protected Stream supportedMessages() protected Stream unsupportedMessages() { return Stream.of( - DiscardAllMessage.DISCARD_ALL, - new RunMessage( "RETURN 42" ) + DiscardAllMessage.DISCARD_ALL ); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/MessageWriterV44Test.java b/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/MessageWriterV44Test.java index 75185916f4..5214bf083f 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/MessageWriterV44Test.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/v44/MessageWriterV44Test.java @@ -39,10 +39,8 @@ import org.neo4j.driver.internal.messaging.request.BeginMessage; import org.neo4j.driver.internal.messaging.request.DiscardMessage; import org.neo4j.driver.internal.messaging.request.HelloMessage; -import org.neo4j.driver.internal.messaging.request.InitMessage; import org.neo4j.driver.internal.messaging.request.PullMessage; import org.neo4j.driver.internal.messaging.request.RouteMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.packstream.PackOutput; import org.neo4j.driver.internal.security.InternalAuthToken; import org.neo4j.driver.internal.util.messaging.AbstractMessageWriterTestBase; @@ -136,8 +134,6 @@ protected Stream unsupportedMessages() { return Stream.of( // Bolt V1, V2 and V3 messages - new InitMessage( "Apa", emptyMap() ), - new RunMessage( "RETURN 1" ), PULL_ALL, DISCARD_ALL ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/ThrowingMessageEncoder.java b/driver/src/test/java/org/neo4j/driver/internal/util/ThrowingMessageEncoder.java index 68c40e929a..f23cabf6ff 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/ThrowingMessageEncoder.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/ThrowingMessageEncoder.java @@ -23,10 +23,6 @@ import java.util.List; -import org.neo4j.driver.internal.messaging.request.ResetMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; -import org.neo4j.driver.internal.messaging.request.RunWithMetadataMessage; - public class ThrowingMessageEncoder extends MessageToMessageEncoder { private final RuntimeException error; @@ -43,19 +39,4 @@ protected void encode( ChannelHandlerContext ctx, T msg, List out ) ctx.pipeline().remove( this ); throw error; } - - public static ThrowingMessageEncoder forRunMessage( RuntimeException error ) - { - return new ThrowingMessageEncoder<>( RunMessage.class, error ); - } - - public static ThrowingMessageEncoder forRunWithMetadataMessage( RuntimeException error ) - { - return new ThrowingMessageEncoder<>( RunWithMetadataMessage.class, error ); - } - - public static ThrowingMessageEncoder forResetMessage( RuntimeException error ) - { - return new ThrowingMessageEncoder<>( ResetMessage.class, error ); - } } diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/messaging/KnowledgeableMessageFormat.java b/driver/src/test/java/org/neo4j/driver/internal/util/messaging/KnowledgeableMessageFormat.java index e8146210d5..e53df8bc99 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/messaging/KnowledgeableMessageFormat.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/messaging/KnowledgeableMessageFormat.java @@ -26,15 +26,11 @@ import org.neo4j.driver.internal.messaging.common.CommonValuePacker; import org.neo4j.driver.internal.messaging.common.CommonValueUnpacker; import org.neo4j.driver.internal.messaging.encode.DiscardAllMessageEncoder; -import org.neo4j.driver.internal.messaging.encode.InitMessageEncoder; import org.neo4j.driver.internal.messaging.encode.PullAllMessageEncoder; import org.neo4j.driver.internal.messaging.encode.ResetMessageEncoder; -import org.neo4j.driver.internal.messaging.encode.RunMessageEncoder; import org.neo4j.driver.internal.messaging.request.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.request.InitMessage; import org.neo4j.driver.internal.messaging.request.PullAllMessage; import org.neo4j.driver.internal.messaging.request.ResetMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.messaging.response.FailureMessage; import org.neo4j.driver.internal.messaging.response.IgnoredMessage; import org.neo4j.driver.internal.messaging.response.RecordMessage; @@ -73,10 +69,8 @@ static Map buildEncoders() Map result = Iterables.newHashMapWithSize( 10 ); // request message encoders result.put( DiscardAllMessage.SIGNATURE, new DiscardAllMessageEncoder() ); - result.put( InitMessage.SIGNATURE, new InitMessageEncoder() ); result.put( PullAllMessage.SIGNATURE, new PullAllMessageEncoder() ); result.put( ResetMessage.SIGNATURE, new ResetMessageEncoder() ); - result.put( RunMessage.SIGNATURE, new RunMessageEncoder() ); // response message encoders result.put( FailureMessage.SIGNATURE, new FailureMessageEncoder() ); result.put( IgnoredMessage.SIGNATURE, new IgnoredMessageEncoder() ); diff --git a/driver/src/test/java/org/neo4j/driver/util/TestUtil.java b/driver/src/test/java/org/neo4j/driver/util/TestUtil.java index 05e9fd501c..832e46f8f5 100644 --- a/driver/src/test/java/org/neo4j/driver/util/TestUtil.java +++ b/driver/src/test/java/org/neo4j/driver/util/TestUtil.java @@ -71,7 +71,6 @@ import org.neo4j.driver.internal.messaging.request.CommitMessage; import org.neo4j.driver.internal.messaging.request.PullMessage; import org.neo4j.driver.internal.messaging.request.RollbackMessage; -import org.neo4j.driver.internal.messaging.request.RunMessage; import org.neo4j.driver.internal.messaging.request.RunWithMetadataMessage; import org.neo4j.driver.internal.messaging.v3.BoltProtocolV3; import org.neo4j.driver.internal.messaging.v4.BoltProtocolV4; @@ -622,11 +621,6 @@ public static String randomString( int size ) return sb.toString(); } - public static ArgumentMatcher runMessageWithQueryMatcher( String query ) - { - return message -> message instanceof RunMessage && Objects.equals( query, ((RunMessage) message).query() ); - } - public static ArgumentMatcher runWithMetaMessageWithQueryMatcher( String query ) { return message -> message instanceof RunWithMetadataMessage && Objects.equals( query, ((RunWithMetadataMessage) message).query() ); @@ -665,16 +659,6 @@ private static void assertNoCircularReferences(Throwable ex, List lis } } - private static void setupSuccessfulPullAll( Connection connection, String query ) - { - doAnswer( invocation -> - { - ResponseHandler handler = invocation.getArgument( 3 ); - handler.onSuccess( emptyMap() ); - return null; - } ).when( connection ).writeAndFlush( argThat( runMessageWithQueryMatcher( query ) ), any(), any(), any() ); - } - private static void setupSuccessResponse( Connection connection, Class messageType ) { doAnswer( invocation ->