From d38b51b2d41d0e9b3e7162432181e020cf2974c4 Mon Sep 17 00:00:00 2001 From: Stefan Plantikow Date: Fri, 20 Nov 2015 11:21:42 +0100 Subject: [PATCH 1/3] Rename org.neo4j.driver to org.neo4j.driver.v1 --- .../org/neo4j/driver/{ => v1}/Config.java | 8 +-- .../org/neo4j/driver/{ => v1}/Directed.java | 2 +- .../org/neo4j/driver/{ => v1}/Driver.java | 8 +-- .../org/neo4j/driver/{ => v1}/Entity.java | 6 +-- .../org/neo4j/driver/{ => v1}/Function.java | 2 +- .../neo4j/driver/{ => v1}/GraphDatabase.java | 2 +- .../org/neo4j/driver/{ => v1}/Identity.java | 4 +- .../neo4j/driver/{ => v1}/InputPosition.java | 2 +- .../java/org/neo4j/driver/{ => v1}/Node.java | 3 +- .../neo4j/driver/{ => v1}/Notification.java | 2 +- .../java/org/neo4j/driver/{ => v1}/Path.java | 2 +- .../java/org/neo4j/driver/{ => v1}/Plan.java | 2 +- .../neo4j/driver/{ => v1}/ProfiledPlan.java | 2 +- .../org/neo4j/driver/{ => v1}/Record.java | 4 +- .../neo4j/driver/{ => v1}/Relationship.java | 2 +- .../org/neo4j/driver/{ => v1}/Result.java | 8 +-- .../neo4j/driver/{ => v1}/ResultSummary.java | 2 +- .../neo4j/driver/{ => v1}/ReusableResult.java | 2 +- .../org/neo4j/driver/{ => v1}/Session.java | 4 +- .../org/neo4j/driver/{ => v1}/Statement.java | 14 ++--- .../driver/{ => v1}/StatementRunner.java | 6 +-- .../neo4j/driver/{ => v1}/StatementType.java | 4 +- .../neo4j/driver/{ => v1}/Transaction.java | 2 +- .../driver/{ => v1}/UpdateStatistics.java | 2 +- .../java/org/neo4j/driver/{ => v1}/Value.java | 4 +- .../org/neo4j/driver/{ => v1}/Values.java | 26 ++++----- .../{ => v1}/exceptions/ClientException.java | 2 +- .../exceptions/DatabaseException.java | 2 +- .../{ => v1}/exceptions/Neo4jException.java | 2 +- .../exceptions/TransientException.java | 2 +- .../exceptions/value/NotMultiValued.java | 2 +- .../exceptions/value/Uncoercible.java | 2 +- .../{ => v1}/exceptions/value/Unsizable.java | 2 +- .../exceptions/value/ValueException.java | 4 +- .../driver/{ => v1}/internal/Identities.java | 4 +- .../{ => v1}/internal/ParameterSupport.java | 4 +- .../{ => v1}/internal/SimpleEntity.java | 8 +-- .../{ => v1}/internal/SimpleIdentity.java | 4 +- .../driver/{ => v1}/internal/SimpleNode.java | 10 ++-- .../driver/{ => v1}/internal/SimplePath.java | 12 ++--- .../{ => v1}/internal/SimpleRecord.java | 6 +-- .../{ => v1}/internal/SimpleRelationship.java | 12 ++--- .../{ => v1}/internal/SimpleResult.java | 14 ++--- .../{ => v1}/internal/StandardSession.java | 18 +++---- .../internal/StandardTransaction.java | 18 +++---- .../driver/{ => v1}/internal/Version.java | 4 +- .../connector/socket/AllOrNothingChannel.java | 6 +-- .../connector/socket/ChunkedInput.java | 8 +-- .../connector/socket/ChunkedOutput.java | 6 +-- .../connector/socket/LoggingByteChannel.java | 6 +-- .../socket/LoggingResponseHandler.java | 14 ++--- .../connector/socket/SSLContextFactory.java | 10 ++-- .../connector/socket/SSLSocketChannel.java | 10 ++-- .../connector/socket/SocketClient.java | 17 +++--- .../connector/socket/SocketConnection.java | 28 +++++----- .../connector/socket/SocketConnector.java | 12 ++--- .../connector/socket/SocketProtocol.java | 6 +-- .../connector/socket/SocketProtocolV1.java | 10 ++-- .../socket/SocketResponseHandler.java | 26 ++++----- .../socket/TrustOnFirstUseTrustManager.java | 4 +- .../internal/logging/ConsoleLogging.java | 6 +-- .../internal/logging/DevNullLogger.java | 4 +- .../{ => v1}/internal/logging/JULogger.java | 4 +- .../{ => v1}/internal/logging/JULogging.java | 6 +-- .../internal/messaging/AckFailureMessage.java | 2 +- .../internal/messaging/DiscardAllMessage.java | 2 +- .../internal/messaging/FailureMessage.java | 2 +- .../internal/messaging/IgnoredMessage.java | 2 +- .../internal/messaging/InitMessage.java | 2 +- .../{ => v1}/internal/messaging/Message.java | 2 +- .../internal/messaging/MessageFormat.java | 2 +- .../internal/messaging/MessageHandler.java | 4 +- .../messaging/PackStreamMessageFormatV1.java | 54 +++++++++---------- .../internal/messaging/PullAllMessage.java | 2 +- .../internal/messaging/RecordMessage.java | 4 +- .../internal/messaging/RunMessage.java | 4 +- .../internal/messaging/SuccessMessage.java | 4 +- .../packstream/BufferedChannelInput.java | 4 +- .../packstream/BufferedChannelOutput.java | 4 +- .../internal/packstream/PackInput.java | 2 +- .../internal/packstream/PackOutput.java | 2 +- .../internal/packstream/PackStream.java | 10 ++-- .../internal/packstream/PackType.java | 2 +- .../{ => v1}/internal/pool/Allocator.java | 8 +-- .../internal/pool/PooledConnection.java | 12 ++--- .../pool/PooledConnectionValidator.java | 6 +-- .../internal/pool/StandardConnectionPool.java | 18 +++---- .../internal/pool/ThreadCachingPool.java | 10 ++-- .../internal/pool/ValidationStrategy.java | 2 +- .../{ => v1}/internal/spi/Connection.java | 4 +- .../{ => v1}/internal/spi/ConnectionPool.java | 2 +- .../{ => v1}/internal/spi/Connector.java | 6 +-- .../driver/{ => v1}/internal/spi/Logger.java | 2 +- .../driver/{ => v1}/internal/spi/Logging.java | 2 +- .../internal/spi/StreamCollector.java | 14 ++--- .../internal/summary/ResultBuilder.java | 30 +++++------ .../internal/summary/SimpleInputPosition.java | 4 +- .../internal/summary/SimpleNotification.java | 10 ++-- .../{ => v1}/internal/summary/SimplePlan.java | 12 ++--- .../internal/summary/SimpleProfiledPlan.java | 8 +-- .../summary/SimpleUpdateStatistics.java | 4 +- .../internal/summary/SummaryBuilder.java | 26 +++++---- .../{ => v1}/internal/util/BytePrinter.java | 2 +- .../internal/util/CertificateTool.java | 2 +- .../driver/{ => v1}/internal/util/Clock.java | 2 +- .../{ => v1}/internal/util/Consumer.java | 2 +- .../{ => v1}/internal/util/Iterables.java | 2 +- .../{ => v1}/internal/value/BooleanValue.java | 2 +- .../{ => v1}/internal/value/FloatValue.java | 2 +- .../internal/value/IdentityValue.java | 4 +- .../{ => v1}/internal/value/IntegerValue.java | 2 +- .../{ => v1}/internal/value/ListValue.java | 6 +-- .../{ => v1}/internal/value/MapValue.java | 6 +-- .../{ => v1}/internal/value/NodeValue.java | 11 ++-- .../{ => v1}/internal/value/PathValue.java | 10 ++-- .../internal/value/RelationshipValue.java | 11 ++-- .../{ => v1}/internal/value/StringValue.java | 2 +- .../{ => v1}/internal/value/ValueAdapter.java | 20 +++---- .../org.neo4j.driver.internal.spi.Connector | 1 - ...org.neo4j.driver.v1.internal.spi.Connector | 1 + .../neo4j/driver/{ => v1}/DriverDocIT.java | 4 +- .../neo4j/driver/{ => v1}/ParametersTest.java | 6 +-- .../neo4j/driver/{ => v1}/ResultDocIT.java | 4 +- .../driver/{ => v1}/StatementRunnerDocIT.java | 4 +- .../neo4j/driver/{ => v1}/StatementTest.java | 6 +-- .../driver/{ => v1}/TransactionDocIT.java | 4 +- .../org/neo4j/driver/{ => v1}/ValueDocIT.java | 4 +- .../integration/ConnectionPoolIT.java | 21 ++------ .../{ => v1}/integration/EntityTypeIT.java | 10 ++-- .../driver/{ => v1}/integration/ErrorIT.java | 12 ++--- .../{ => v1}/integration/LoadCSVIT.java | 14 ++--- .../{ => v1}/integration/LoggingIT.java | 18 +++---- .../{ => v1}/integration/ParametersIT.java | 14 ++--- .../{ => v1}/integration/ResultStreamIT.java | 12 ++--- .../integration/SSLSocketChannelIT.java | 48 ++++++++--------- .../{ => v1}/integration/ScalarTypeIT.java | 31 +++++------ .../{ => v1}/integration/ServerKilledIT.java | 14 ++--- .../{ => v1}/integration/SessionIT.java | 10 ++-- .../{ => v1}/integration/StatementIT.java | 16 +++--- .../{ => v1}/integration/SummaryIT.java | 33 ++++++------ .../{ => v1}/integration/TransactionIT.java | 10 ++-- .../driver/{ => v1}/internal/ConfigTest.java | 17 +++--- .../internal/SelfContainedNodeTest.java | 12 ++--- .../{ => v1}/internal/SimpleIdentityTest.java | 6 +-- .../{ => v1}/internal/SimplePathTest.java | 25 ++++----- .../internal/StandardSessionTest.java | 10 ++-- .../internal/StandardTransactionTest.java | 4 +- .../{ => v1}/internal/SummaryBuilderTest.java | 12 ++--- .../driver/{ => v1}/internal/ValuesTest.java | 22 ++++---- .../connector/socket/ChunkedInputTest.java | 8 +-- .../connector/socket/ChunkedOutputTest.java | 9 ++-- .../socket/LoggingResponseHandlerTest.java | 30 +++++------ .../socket/SSLSocketChannelTest.java | 9 ++-- .../connector/socket/SocketClientTest.java | 10 ++-- .../socket/SocketResponseHandlerTest.java | 22 ++++---- .../TrustOnFirstUseTrustManagerTest.java | 2 +- .../internal/logging/ConsoleLoggingTest.java | 6 +-- .../internal/messaging/MessageFormatTest.java | 22 ++++---- .../internal/packstream/PackStreamTest.java | 7 +-- .../pool/ConnectionInvalidationTest.java | 14 ++--- .../pool/StandardConnectionPoolTest.java | 12 ++--- .../internal/pool/ThreadCachingPoolTest.java | 26 ++++----- .../internal/summary/ResultBuilderTest.java | 14 ++--- .../internal/summary/SimplePlanTest.java | 12 ++--- .../internal/value/BooleanValueTest.java | 4 +- .../internal/value/FloatValueTest.java | 4 +- .../internal/value/IdentityValueTest.java | 17 +++--- .../internal/value/IntegerValueTest.java | 4 +- .../internal/value/NodeValueTest.java | 6 +-- .../internal/value/RelationshipValueTest.java | 4 +- .../internal/value/StringValueTest.java | 2 +- .../{ => v1}/stress/DriverStresser.java | 16 +++--- .../driver/{ => v1}/util/BytePrinterTest.java | 9 ++-- .../{ => v1}/util/CertificateToolTest.java | 6 +-- .../driver/{ => v1}/util/DumpMessage.java | 42 +++++++-------- .../neo4j/driver/{ => v1}/util/FileTools.java | 2 +- .../driver/{ => v1}/util/FileToolsTest.java | 5 +- .../org/neo4j/driver/{ => v1}/util/Lists.java | 2 +- .../{ => v1}/util/Neo4jDefaultInstaller.java | 2 +- .../driver/{ => v1}/util/Neo4jInstaller.java | 6 +-- .../driver/{ => v1}/util/Neo4jResetMode.java | 2 +- .../driver/{ => v1}/util/Neo4jRunner.java | 33 ++++++------ .../driver/{ => v1}/util/Neo4jSettings.java | 2 +- .../{ => v1}/util/Neo4jWindowsInstaller.java | 2 +- .../{ => v1}/util/RecordingByteChannel.java | 2 +- .../neo4j/driver/{ => v1}/util/TestNeo4j.java | 17 +++--- .../{ => v1}/util/TestNeo4jSession.java | 12 ++--- 187 files changed, 802 insertions(+), 823 deletions(-) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Config.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Directed.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Driver.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Entity.java (87%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Function.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/GraphDatabase.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Identity.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/InputPosition.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Node.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Notification.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Path.java (99%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Plan.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/ProfiledPlan.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Record.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Relationship.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Result.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/ResultSummary.java (99%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/ReusableResult.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Session.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Statement.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/StatementRunner.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/StatementType.java (93%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Transaction.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/UpdateStatistics.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Value.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/Values.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/exceptions/ClientException.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/exceptions/DatabaseException.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/exceptions/Neo4jException.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/exceptions/TransientException.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/exceptions/value/NotMultiValued.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/exceptions/value/Uncoercible.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/exceptions/value/Unsizable.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/exceptions/value/ValueException.java (89%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/Identities.java (91%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/ParameterSupport.java (93%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/SimpleEntity.java (93%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/SimpleIdentity.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/SimpleNode.java (90%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/SimplePath.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/SimpleRecord.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/SimpleRelationship.java (87%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/SimpleResult.java (91%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/StandardSession.java (88%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/StandardTransaction.java (91%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/Version.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/AllOrNothingChannel.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/ChunkedInput.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/ChunkedOutput.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/LoggingByteChannel.java (92%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/LoggingResponseHandler.java (85%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SSLContextFactory.java (88%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SSLSocketChannel.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SocketClient.java (93%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SocketConnection.java (84%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SocketConnector.java (83%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SocketProtocol.java (80%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SocketProtocolV1.java (83%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SocketResponseHandler.java (89%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/connector/socket/TrustOnFirstUseTrustManager.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/logging/ConsoleLogging.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/logging/DevNullLogger.java (93%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/logging/JULogger.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/logging/JULogging.java (87%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/AckFailureMessage.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/DiscardAllMessage.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/FailureMessage.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/IgnoredMessage.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/InitMessage.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/Message.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/MessageFormat.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/MessageHandler.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/PackStreamMessageFormatV1.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/PullAllMessage.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/RecordMessage.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/RunMessage.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/messaging/SuccessMessage.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/packstream/BufferedChannelInput.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/packstream/BufferedChannelOutput.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/packstream/PackInput.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/packstream/PackOutput.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/packstream/PackStream.java (99%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/packstream/PackType.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/pool/Allocator.java (87%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/pool/PooledConnection.java (92%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/pool/PooledConnectionValidator.java (93%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/pool/StandardConnectionPool.java (93%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/pool/ThreadCachingPool.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/pool/ValidationStrategy.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/spi/Connection.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/spi/ConnectionPool.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/spi/Connector.java (92%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/spi/Logger.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/spi/Logging.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/spi/StreamCollector.java (87%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/summary/ResultBuilder.java (82%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/summary/SimpleInputPosition.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/summary/SimpleNotification.java (93%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/summary/SimplePlan.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/summary/SimpleProfiledPlan.java (93%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/summary/SimpleUpdateStatistics.java (98%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/summary/SummaryBuilder.java (86%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/util/BytePrinter.java (99%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/util/CertificateTool.java (99%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/util/Clock.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/util/Consumer.java (94%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/util/Iterables.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/BooleanValue.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/FloatValue.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/IdentityValue.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/IntegerValue.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/ListValue.java (95%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/MapValue.java (96%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/NodeValue.java (89%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/PathValue.java (88%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/RelationshipValue.java (88%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/StringValue.java (97%) rename driver/src/main/java/org/neo4j/driver/{ => v1}/internal/value/ValueAdapter.java (91%) delete mode 100644 driver/src/main/resources/META-INF/services/org.neo4j.driver.internal.spi.Connector create mode 100644 driver/src/main/resources/META-INF/services/org.neo4j.driver.v1.internal.spi.Connector rename driver/src/test/java/org/neo4j/driver/{ => v1}/DriverDocIT.java (95%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/ParametersTest.java (93%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/ResultDocIT.java (94%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/StatementRunnerDocIT.java (95%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/StatementTest.java (95%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/TransactionDocIT.java (95%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/ValueDocIT.java (95%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/ConnectionPoolIT.java (90%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/EntityTypeIT.java (92%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/ErrorIT.java (93%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/LoadCSVIT.java (97%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/LoggingIT.java (83%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/ParametersIT.java (97%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/ResultStreamIT.java (92%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/SSLSocketChannelIT.java (84%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/ScalarTypeIT.java (70%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/ServerKilledIT.java (90%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/SessionIT.java (85%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/StatementIT.java (91%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/SummaryIT.java (88%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/integration/TransactionIT.java (94%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/ConfigTest.java (76%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/SelfContainedNodeTest.java (90%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/SimpleIdentityTest.java (95%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/SimplePathTest.java (89%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/StandardSessionTest.java (92%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/StandardTransactionTest.java (97%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/SummaryBuilderTest.java (88%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/ValuesTest.java (90%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/connector/socket/ChunkedInputTest.java (96%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/connector/socket/ChunkedOutputTest.java (91%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/connector/socket/LoggingResponseHandlerTest.java (82%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SSLSocketChannelTest.java (98%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SocketClientTest.java (89%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/connector/socket/SocketResponseHandlerTest.java (89%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/connector/socket/TrustOnFirstUseTrustManagerTest.java (98%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/logging/ConsoleLoggingTest.java (94%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/messaging/MessageFormatTest.java (91%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/packstream/PackStreamTest.java (99%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/pool/ConnectionInvalidationTest.java (89%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/pool/StandardConnectionPoolTest.java (90%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/pool/ThreadCachingPoolTest.java (95%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/summary/ResultBuilderTest.java (88%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/summary/SimplePlanTest.java (92%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/value/BooleanValueTest.java (98%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/value/FloatValueTest.java (98%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/value/IdentityValueTest.java (85%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/value/IntegerValueTest.java (98%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/value/NodeValueTest.java (89%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/value/RelationshipValueTest.java (91%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/internal/value/StringValueTest.java (97%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/stress/DriverStresser.java (93%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/BytePrinterTest.java (92%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/CertificateToolTest.java (96%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/DumpMessage.java (90%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/FileTools.java (99%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/FileToolsTest.java (96%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/Lists.java (96%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/Neo4jDefaultInstaller.java (98%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/Neo4jInstaller.java (96%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/Neo4jResetMode.java (95%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/Neo4jRunner.java (90%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/Neo4jSettings.java (98%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/Neo4jWindowsInstaller.java (98%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/RecordingByteChannel.java (98%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/TestNeo4j.java (90%) rename driver/src/test/java/org/neo4j/driver/{ => v1}/util/TestNeo4jSession.java (92%) diff --git a/driver/src/main/java/org/neo4j/driver/Config.java b/driver/src/main/java/org/neo4j/driver/v1/Config.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/Config.java rename to driver/src/main/java/org/neo4j/driver/v1/Config.java index 4f2139cd2e..33e5938a3e 100644 --- a/driver/src/main/java/org/neo4j/driver/Config.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Config.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.io.File; import java.util.logging.Level; -import org.neo4j.driver.internal.logging.JULogging; -import org.neo4j.driver.internal.spi.Logging; +import org.neo4j.driver.v1.internal.logging.JULogging; +import org.neo4j.driver.v1.internal.spi.Logging; -import static org.neo4j.driver.Config.TlsAuthenticationConfig.*; +import static org.neo4j.driver.v1.Config.TlsAuthenticationConfig.*; /** * A configuration class to config driver properties. diff --git a/driver/src/main/java/org/neo4j/driver/Directed.java b/driver/src/main/java/org/neo4j/driver/v1/Directed.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/Directed.java rename to driver/src/main/java/org/neo4j/driver/v1/Directed.java index afbe102709..f8cfd273fc 100644 --- a/driver/src/main/java/org/neo4j/driver/Directed.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Directed.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * An item that can be considered to have direction. diff --git a/driver/src/main/java/org/neo4j/driver/Driver.java b/driver/src/main/java/org/neo4j/driver/v1/Driver.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/Driver.java rename to driver/src/main/java/org/neo4j/driver/v1/Driver.java index b661f30d5a..be15a91e94 100644 --- a/driver/src/main/java/org/neo4j/driver/Driver.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Driver.java @@ -16,13 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.net.URI; -import org.neo4j.driver.internal.StandardSession; -import org.neo4j.driver.internal.pool.StandardConnectionPool; -import org.neo4j.driver.internal.spi.ConnectionPool; +import org.neo4j.driver.v1.internal.StandardSession; +import org.neo4j.driver.v1.internal.pool.StandardConnectionPool; +import org.neo4j.driver.v1.internal.spi.ConnectionPool; /** * A Neo4j database driver, through which you can create {@link Session sessions} to run statements against the database. diff --git a/driver/src/main/java/org/neo4j/driver/Entity.java b/driver/src/main/java/org/neo4j/driver/v1/Entity.java similarity index 87% rename from driver/src/main/java/org/neo4j/driver/Entity.java rename to driver/src/main/java/org/neo4j/driver/v1/Entity.java index 7b2332fead..db054ff25a 100644 --- a/driver/src/main/java/org/neo4j/driver/Entity.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Entity.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * A uniquely identifiable property container that can form part of a Neo4j graph. @@ -24,7 +24,7 @@ public interface Entity { /** - * A unique {@link org.neo4j.driver.Identity identity} for this Entity. Identities are guaranteed + * A unique {@link Identity identity} for this Entity. Identities are guaranteed * to remain stable for the duration of the session they were found in, but may be re-used for other * entities after that. As such, if you want a public identity to use for your entities, attaching * an explicit 'id' property or similar persistent and unique identifier is a better choice. @@ -48,7 +48,7 @@ public interface Entity int propertyCount(); /** - * Return a specific property {@link org.neo4j.driver.Value}. If no value could be found with the specified key, + * Return a specific property {@link Value}. If no value could be found with the specified key, * null will be returned. * * @param key a property key diff --git a/driver/src/main/java/org/neo4j/driver/Function.java b/driver/src/main/java/org/neo4j/driver/v1/Function.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/Function.java rename to driver/src/main/java/org/neo4j/driver/v1/Function.java index 751d9847f2..273ef97264 100644 --- a/driver/src/main/java/org/neo4j/driver/Function.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Function.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * Same as {@link java.util.function.Function}, but defined here to work in versions older than java 8. diff --git a/driver/src/main/java/org/neo4j/driver/GraphDatabase.java b/driver/src/main/java/org/neo4j/driver/v1/GraphDatabase.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/GraphDatabase.java rename to driver/src/main/java/org/neo4j/driver/v1/GraphDatabase.java index 013d8d7467..aaf39a1e8c 100644 --- a/driver/src/main/java/org/neo4j/driver/GraphDatabase.java +++ b/driver/src/main/java/org/neo4j/driver/v1/GraphDatabase.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.net.URI; diff --git a/driver/src/main/java/org/neo4j/driver/Identity.java b/driver/src/main/java/org/neo4j/driver/v1/Identity.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/Identity.java rename to driver/src/main/java/org/neo4j/driver/v1/Identity.java index 2eb5fbba47..6fdde4bac0 100644 --- a/driver/src/main/java/org/neo4j/driver/Identity.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Identity.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** - * A unique identifier for an {@link org.neo4j.driver.Entity}. + * A unique identifier for an {@link Entity}. *

* The identity can be used to correlate entities in one response with entities received earlier. The identity of an * entity is guaranteed to be stable within the scope of a session. Beyond that, the identity may change. If you want diff --git a/driver/src/main/java/org/neo4j/driver/InputPosition.java b/driver/src/main/java/org/neo4j/driver/v1/InputPosition.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/InputPosition.java rename to driver/src/main/java/org/neo4j/driver/v1/InputPosition.java index 1895791db5..c043c27f21 100644 --- a/driver/src/main/java/org/neo4j/driver/InputPosition.java +++ b/driver/src/main/java/org/neo4j/driver/v1/InputPosition.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * An input position refers to a specific character in a statement. diff --git a/driver/src/main/java/org/neo4j/driver/Node.java b/driver/src/main/java/org/neo4j/driver/v1/Node.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/Node.java rename to driver/src/main/java/org/neo4j/driver/v1/Node.java index 220714e212..d213309c26 100644 --- a/driver/src/main/java/org/neo4j/driver/Node.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Node.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * The Node interface describes the characteristics of a node from a Neo4j graph. @@ -29,5 +29,4 @@ public interface Node extends Entity * @return a label Collection */ Iterable labels(); - } diff --git a/driver/src/main/java/org/neo4j/driver/Notification.java b/driver/src/main/java/org/neo4j/driver/v1/Notification.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/Notification.java rename to driver/src/main/java/org/neo4j/driver/v1/Notification.java index 76cfe53a22..e78e16698c 100644 --- a/driver/src/main/java/org/neo4j/driver/Notification.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Notification.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * Representation for notifications found when executing a statement. diff --git a/driver/src/main/java/org/neo4j/driver/Path.java b/driver/src/main/java/org/neo4j/driver/v1/Path.java similarity index 99% rename from driver/src/main/java/org/neo4j/driver/Path.java rename to driver/src/main/java/org/neo4j/driver/v1/Path.java index e4b11bcb3f..99454bbddd 100644 --- a/driver/src/main/java/org/neo4j/driver/Path.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Path.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * A Path is a directed sequence of relationships between two nodes. This generally diff --git a/driver/src/main/java/org/neo4j/driver/Plan.java b/driver/src/main/java/org/neo4j/driver/v1/Plan.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/Plan.java rename to driver/src/main/java/org/neo4j/driver/v1/Plan.java index 2394072743..92afebb77e 100644 --- a/driver/src/main/java/org/neo4j/driver/Plan.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Plan.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.util.List; import java.util.Map; diff --git a/driver/src/main/java/org/neo4j/driver/ProfiledPlan.java b/driver/src/main/java/org/neo4j/driver/v1/ProfiledPlan.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/ProfiledPlan.java rename to driver/src/main/java/org/neo4j/driver/v1/ProfiledPlan.java index a7adb49519..7520a1c4a5 100644 --- a/driver/src/main/java/org/neo4j/driver/ProfiledPlan.java +++ b/driver/src/main/java/org/neo4j/driver/v1/ProfiledPlan.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.util.List; diff --git a/driver/src/main/java/org/neo4j/driver/Record.java b/driver/src/main/java/org/neo4j/driver/v1/Record.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/Record.java rename to driver/src/main/java/org/neo4j/driver/v1/Record.java index b12a98f06b..30c93ac015 100644 --- a/driver/src/main/java/org/neo4j/driver/Record.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Record.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * A record is a collection of named fields, and is what makes up the individual items in a {@link - * org.neo4j.driver.Result} + * Result} */ public interface Record { diff --git a/driver/src/main/java/org/neo4j/driver/Relationship.java b/driver/src/main/java/org/neo4j/driver/v1/Relationship.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/Relationship.java rename to driver/src/main/java/org/neo4j/driver/v1/Relationship.java index 61285ac478..cbf803f9b5 100644 --- a/driver/src/main/java/org/neo4j/driver/Relationship.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Relationship.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * The Relationship interface describes the characteristics of a relationship from a Neo4j graph. diff --git a/driver/src/main/java/org/neo4j/driver/Result.java b/driver/src/main/java/org/neo4j/driver/v1/Result.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/Result.java rename to driver/src/main/java/org/neo4j/driver/v1/Result.java index 76a2b7f482..f15a217a7e 100644 --- a/driver/src/main/java/org/neo4j/driver/Result.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Result.java @@ -16,7 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; + +import org.neo4j.driver.v1.exceptions.ClientException; /** * The result of running a statement, a stream of records. The result interface can be used to iterate over all the @@ -36,7 +38,7 @@ public interface Result * * This cannot be used if you have already started iterating through the stream using {@link #next()}. * - * @return {@link org.neo4j.driver.ReusableResult} + * @return {@link ReusableResult} */ ReusableResult retain(); @@ -83,7 +85,7 @@ public interface Result * * * @return a single record from the stream - * @throws org.neo4j.driver.exceptions.ClientException if the stream is empty + * @throws ClientException if the stream is empty */ Record single(); diff --git a/driver/src/main/java/org/neo4j/driver/ResultSummary.java b/driver/src/main/java/org/neo4j/driver/v1/ResultSummary.java similarity index 99% rename from driver/src/main/java/org/neo4j/driver/ResultSummary.java rename to driver/src/main/java/org/neo4j/driver/v1/ResultSummary.java index 4016e0430f..b659fb8a94 100644 --- a/driver/src/main/java/org/neo4j/driver/ResultSummary.java +++ b/driver/src/main/java/org/neo4j/driver/v1/ResultSummary.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.util.List; diff --git a/driver/src/main/java/org/neo4j/driver/ReusableResult.java b/driver/src/main/java/org/neo4j/driver/v1/ReusableResult.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/ReusableResult.java rename to driver/src/main/java/org/neo4j/driver/v1/ReusableResult.java index bdaa1e6796..62106d6d1b 100644 --- a/driver/src/main/java/org/neo4j/driver/ReusableResult.java +++ b/driver/src/main/java/org/neo4j/driver/v1/ReusableResult.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * A {@link Result} that has been fully retrieved and stored from the server. diff --git a/driver/src/main/java/org/neo4j/driver/Session.java b/driver/src/main/java/org/neo4j/driver/v1/Session.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/Session.java rename to driver/src/main/java/org/neo4j/driver/v1/Session.java index adbc339ec6..c1c72dc1d7 100644 --- a/driver/src/main/java/org/neo4j/driver/Session.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Session.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * A live session with a Neo4j instance. @@ -49,4 +49,4 @@ public interface Session extends AutoCloseable, StatementRunner @Override void close(); -} \ No newline at end of file +} diff --git a/driver/src/main/java/org/neo4j/driver/Statement.java b/driver/src/main/java/org/neo4j/driver/v1/Statement.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/Statement.java rename to driver/src/main/java/org/neo4j/driver/v1/Statement.java index 02d147fbf2..a703665196 100644 --- a/driver/src/main/java/org/neo4j/driver/Statement.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Statement.java @@ -16,24 +16,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.neo4j.driver.internal.ParameterSupport; +import org.neo4j.driver.v1.internal.ParameterSupport; import static java.lang.String.format; /** * An executable statement, i.e. the statements' text and its parameters. * - * @see org.neo4j.driver.Session - * @see org.neo4j.driver.Transaction - * @see org.neo4j.driver.Result - * @see org.neo4j.driver.Result#summarize() - * @see org.neo4j.driver.ResultSummary + * @see Session + * @see Transaction + * @see Result + * @see Result#summarize() + * @see ResultSummary */ public class Statement { diff --git a/driver/src/main/java/org/neo4j/driver/StatementRunner.java b/driver/src/main/java/org/neo4j/driver/v1/StatementRunner.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/StatementRunner.java rename to driver/src/main/java/org/neo4j/driver/v1/StatementRunner.java index c7915a63ba..75ee7055d7 100644 --- a/driver/src/main/java/org/neo4j/driver/StatementRunner.java +++ b/driver/src/main/java/org/neo4j/driver/v1/StatementRunner.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.util.Map; /** * Common interface for components that can execute Neo4j statements. * - * @see org.neo4j.driver.Session - * @see org.neo4j.driver.Transaction + * @see Session + * @see Transaction */ public interface StatementRunner { diff --git a/driver/src/main/java/org/neo4j/driver/StatementType.java b/driver/src/main/java/org/neo4j/driver/v1/StatementType.java similarity index 93% rename from driver/src/main/java/org/neo4j/driver/StatementType.java rename to driver/src/main/java/org/neo4j/driver/v1/StatementType.java index caf92953d9..775cb456ba 100644 --- a/driver/src/main/java/org/neo4j/driver/StatementType.java +++ b/driver/src/main/java/org/neo4j/driver/v1/StatementType.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.ClientException; public enum StatementType { diff --git a/driver/src/main/java/org/neo4j/driver/Transaction.java b/driver/src/main/java/org/neo4j/driver/v1/Transaction.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/Transaction.java rename to driver/src/main/java/org/neo4j/driver/v1/Transaction.java index 2987e206a7..37c7de992b 100644 --- a/driver/src/main/java/org/neo4j/driver/Transaction.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Transaction.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * Represents a transaction in the Neo4j database. diff --git a/driver/src/main/java/org/neo4j/driver/UpdateStatistics.java b/driver/src/main/java/org/neo4j/driver/v1/UpdateStatistics.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/UpdateStatistics.java rename to driver/src/main/java/org/neo4j/driver/v1/UpdateStatistics.java index 57b8524274..3c408fb947 100644 --- a/driver/src/main/java/org/neo4j/driver/UpdateStatistics.java +++ b/driver/src/main/java/org/neo4j/driver/v1/UpdateStatistics.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; /** * Contains counters for the number of update operations performed by a statement. diff --git a/driver/src/main/java/org/neo4j/driver/Value.java b/driver/src/main/java/org/neo4j/driver/v1/Value.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/Value.java rename to driver/src/main/java/org/neo4j/driver/v1/Value.java index 647af8f75d..d5ceba6528 100644 --- a/driver/src/main/java/org/neo4j/driver/Value.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Value.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.util.List; import java.util.Map; @@ -34,7 +34,7 @@ *

Navigating a tree structure

* * Because Neo4j often handles dynamic structures, this interface is designed to help - * you handle such structures in Java. Specifically, {@link org.neo4j.driver.Value} lets you navigate arbitrary tree + * you handle such structures in Java. Specifically, {@link Value} lets you navigate arbitrary tree * structures without having to resort to type casting. * * Given a tree structure like: diff --git a/driver/src/main/java/org/neo4j/driver/Values.java b/driver/src/main/java/org/neo4j/driver/v1/Values.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/Values.java rename to driver/src/main/java/org/neo4j/driver/v1/Values.java index ab380ca115..e68570d899 100644 --- a/driver/src/main/java/org/neo4j/driver/Values.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Values.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.util.ArrayList; import java.util.Arrays; @@ -26,20 +26,20 @@ import java.util.List; import java.util.Map; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.value.BooleanValue; -import org.neo4j.driver.internal.value.FloatValue; -import org.neo4j.driver.internal.value.IdentityValue; -import org.neo4j.driver.internal.value.IntegerValue; -import org.neo4j.driver.internal.value.ListValue; -import org.neo4j.driver.internal.value.MapValue; -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.internal.value.StringValue; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.value.BooleanValue; +import org.neo4j.driver.v1.internal.value.FloatValue; +import org.neo4j.driver.v1.internal.value.IdentityValue; +import org.neo4j.driver.v1.internal.value.IntegerValue; +import org.neo4j.driver.v1.internal.value.ListValue; +import org.neo4j.driver.v1.internal.value.MapValue; +import org.neo4j.driver.v1.internal.value.NodeValue; +import org.neo4j.driver.v1.internal.value.PathValue; +import org.neo4j.driver.v1.internal.value.RelationshipValue; +import org.neo4j.driver.v1.internal.value.StringValue; /** - * Utility for wrapping regular Java types and exposing them as {@link org.neo4j.driver.Value} + * Utility for wrapping regular Java types and exposing them as {@link Value} * objects. */ public class Values diff --git a/driver/src/main/java/org/neo4j/driver/exceptions/ClientException.java b/driver/src/main/java/org/neo4j/driver/v1/exceptions/ClientException.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/exceptions/ClientException.java rename to driver/src/main/java/org/neo4j/driver/v1/exceptions/ClientException.java index 8412c53a71..740dda7b50 100644 --- a/driver/src/main/java/org/neo4j/driver/exceptions/ClientException.java +++ b/driver/src/main/java/org/neo4j/driver/v1/exceptions/ClientException.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.exceptions; +package org.neo4j.driver.v1.exceptions; /** * A ClientException indicates that the client has carried out an operation incorrectly. diff --git a/driver/src/main/java/org/neo4j/driver/exceptions/DatabaseException.java b/driver/src/main/java/org/neo4j/driver/v1/exceptions/DatabaseException.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/exceptions/DatabaseException.java rename to driver/src/main/java/org/neo4j/driver/v1/exceptions/DatabaseException.java index 34717a55b6..a8d2d9cc40 100644 --- a/driver/src/main/java/org/neo4j/driver/exceptions/DatabaseException.java +++ b/driver/src/main/java/org/neo4j/driver/v1/exceptions/DatabaseException.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.exceptions; +package org.neo4j.driver.v1.exceptions; /** * A DatabaseException indicates that there is a problem within the underlying database. diff --git a/driver/src/main/java/org/neo4j/driver/exceptions/Neo4jException.java b/driver/src/main/java/org/neo4j/driver/v1/exceptions/Neo4jException.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/exceptions/Neo4jException.java rename to driver/src/main/java/org/neo4j/driver/v1/exceptions/Neo4jException.java index 1ee50f85d7..634c397699 100644 --- a/driver/src/main/java/org/neo4j/driver/exceptions/Neo4jException.java +++ b/driver/src/main/java/org/neo4j/driver/v1/exceptions/Neo4jException.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.exceptions; +package org.neo4j.driver.v1.exceptions; /** * This is the base class for all Neo4j exceptions. diff --git a/driver/src/main/java/org/neo4j/driver/exceptions/TransientException.java b/driver/src/main/java/org/neo4j/driver/v1/exceptions/TransientException.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/exceptions/TransientException.java rename to driver/src/main/java/org/neo4j/driver/v1/exceptions/TransientException.java index 863dd82497..b3fc1ea613 100644 --- a/driver/src/main/java/org/neo4j/driver/exceptions/TransientException.java +++ b/driver/src/main/java/org/neo4j/driver/v1/exceptions/TransientException.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.exceptions; +package org.neo4j.driver.v1.exceptions; /** * A TransientException signals a temporary fault that may be worked around by retrying. diff --git a/driver/src/main/java/org/neo4j/driver/exceptions/value/NotMultiValued.java b/driver/src/main/java/org/neo4j/driver/v1/exceptions/value/NotMultiValued.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/exceptions/value/NotMultiValued.java rename to driver/src/main/java/org/neo4j/driver/v1/exceptions/value/NotMultiValued.java index 6f1925e0e5..459754c962 100644 --- a/driver/src/main/java/org/neo4j/driver/exceptions/value/NotMultiValued.java +++ b/driver/src/main/java/org/neo4j/driver/v1/exceptions/value/NotMultiValued.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.exceptions.value; +package org.neo4j.driver.v1.exceptions.value; public class NotMultiValued extends ValueException { diff --git a/driver/src/main/java/org/neo4j/driver/exceptions/value/Uncoercible.java b/driver/src/main/java/org/neo4j/driver/v1/exceptions/value/Uncoercible.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/exceptions/value/Uncoercible.java rename to driver/src/main/java/org/neo4j/driver/v1/exceptions/value/Uncoercible.java index dbad6291d9..7e88dbe3ce 100644 --- a/driver/src/main/java/org/neo4j/driver/exceptions/value/Uncoercible.java +++ b/driver/src/main/java/org/neo4j/driver/v1/exceptions/value/Uncoercible.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.exceptions.value; +package org.neo4j.driver.v1.exceptions.value; import static java.lang.String.format; diff --git a/driver/src/main/java/org/neo4j/driver/exceptions/value/Unsizable.java b/driver/src/main/java/org/neo4j/driver/v1/exceptions/value/Unsizable.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/exceptions/value/Unsizable.java rename to driver/src/main/java/org/neo4j/driver/v1/exceptions/value/Unsizable.java index 0c5dbf4cb2..cf0354062e 100644 --- a/driver/src/main/java/org/neo4j/driver/exceptions/value/Unsizable.java +++ b/driver/src/main/java/org/neo4j/driver/v1/exceptions/value/Unsizable.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.exceptions.value; +package org.neo4j.driver.v1.exceptions.value; public class Unsizable extends ValueException { diff --git a/driver/src/main/java/org/neo4j/driver/exceptions/value/ValueException.java b/driver/src/main/java/org/neo4j/driver/v1/exceptions/value/ValueException.java similarity index 89% rename from driver/src/main/java/org/neo4j/driver/exceptions/value/ValueException.java rename to driver/src/main/java/org/neo4j/driver/v1/exceptions/value/ValueException.java index cdb98f163a..ab2b0eaaf4 100644 --- a/driver/src/main/java/org/neo4j/driver/exceptions/value/ValueException.java +++ b/driver/src/main/java/org/neo4j/driver/v1/exceptions/value/ValueException.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.exceptions.value; +package org.neo4j.driver.v1.exceptions.value; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.ClientException; public class ValueException extends ClientException { diff --git a/driver/src/main/java/org/neo4j/driver/internal/Identities.java b/driver/src/main/java/org/neo4j/driver/v1/internal/Identities.java similarity index 91% rename from driver/src/main/java/org/neo4j/driver/internal/Identities.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/Identities.java index 1af4c30e97..b08c42c9de 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/Identities.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/Identities.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; -import org.neo4j.driver.Identity; +import org.neo4j.driver.v1.Identity; public class Identities { diff --git a/driver/src/main/java/org/neo4j/driver/internal/ParameterSupport.java b/driver/src/main/java/org/neo4j/driver/v1/internal/ParameterSupport.java similarity index 93% rename from driver/src/main/java/org/neo4j/driver/internal/ParameterSupport.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/ParameterSupport.java index 29ddaa45e1..eebaa68b4f 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/ParameterSupport.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/ParameterSupport.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import java.util.Collections; import java.util.Map; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; public final class ParameterSupport { diff --git a/driver/src/main/java/org/neo4j/driver/internal/SimpleEntity.java b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleEntity.java similarity index 93% rename from driver/src/main/java/org/neo4j/driver/internal/SimpleEntity.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/SimpleEntity.java index 6289fcb85a..2c9f78c895 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleEntity.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleEntity.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import java.util.Collection; import java.util.Map; -import org.neo4j.driver.Entity; -import org.neo4j.driver.Identity; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Entity; +import org.neo4j.driver.v1.Identity; +import org.neo4j.driver.v1.Value; public abstract class SimpleEntity implements Entity { diff --git a/driver/src/main/java/org/neo4j/driver/internal/SimpleIdentity.java b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleIdentity.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/internal/SimpleIdentity.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/SimpleIdentity.java index dd535c6a2c..cb5b81f3dc 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleIdentity.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleIdentity.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; -import org.neo4j.driver.Identity; +import org.neo4j.driver.v1.Identity; public class SimpleIdentity implements Identity { diff --git a/driver/src/main/java/org/neo4j/driver/internal/SimpleNode.java b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleNode.java similarity index 90% rename from driver/src/main/java/org/neo4j/driver/internal/SimpleNode.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/SimpleNode.java index dd1132725a..ef731eaa0e 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleNode.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleNode.java @@ -16,18 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import java.util.Collection; import java.util.Collections; import java.util.Map; -import org.neo4j.driver.Identity; -import org.neo4j.driver.Node; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Identity; +import org.neo4j.driver.v1.Node; +import org.neo4j.driver.v1.Value; /** - * {@link org.neo4j.driver.Node} implementation that directly contains labels and properties. + * {@link Node} implementation that directly contains labels and properties. */ public class SimpleNode extends SimpleEntity implements Node { diff --git a/driver/src/main/java/org/neo4j/driver/internal/SimplePath.java b/driver/src/main/java/org/neo4j/driver/v1/internal/SimplePath.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/SimplePath.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/SimplePath.java index 0646b7b361..5a61d594aa 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimplePath.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/SimplePath.java @@ -16,20 +16,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.neo4j.driver.Entity; -import org.neo4j.driver.Node; -import org.neo4j.driver.Path; -import org.neo4j.driver.Relationship; +import org.neo4j.driver.v1.Entity; +import org.neo4j.driver.v1.Node; +import org.neo4j.driver.v1.Path; +import org.neo4j.driver.v1.Relationship; /** - * {@link org.neo4j.driver.Path} implementation that directly contains all nodes and relationships. + * {@link Path} implementation that directly contains all nodes and relationships. */ public class SimplePath implements Path { diff --git a/driver/src/main/java/org/neo4j/driver/internal/SimpleRecord.java b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleRecord.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/SimpleRecord.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/SimpleRecord.java index 955a16208b..fcdc272220 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleRecord.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleRecord.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.neo4j.driver.Record; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Record; +import org.neo4j.driver.v1.Value; public class SimpleRecord implements Record { diff --git a/driver/src/main/java/org/neo4j/driver/internal/SimpleRelationship.java b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleRelationship.java similarity index 87% rename from driver/src/main/java/org/neo4j/driver/internal/SimpleRelationship.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/SimpleRelationship.java index 3d620e23bb..dce928acc3 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleRelationship.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleRelationship.java @@ -16,18 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import java.util.Collections; import java.util.Map; -import org.neo4j.driver.Identity; -import org.neo4j.driver.Relationship; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Identity; +import org.neo4j.driver.v1.Relationship; +import org.neo4j.driver.v1.Value; /** - * {@link org.neo4j.driver.Relationship} implementation that directly contains type and properties - * along with {@link org.neo4j.driver.Identity} values for start and end nodes. + * {@link Relationship} implementation that directly contains type and properties + * along with {@link Identity} values for start and end nodes. */ public class SimpleRelationship extends SimpleEntity implements Relationship { diff --git a/driver/src/main/java/org/neo4j/driver/internal/SimpleResult.java b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleResult.java similarity index 91% rename from driver/src/main/java/org/neo4j/driver/internal/SimpleResult.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/SimpleResult.java index 5ed7357195..42fe9da602 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleResult.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/SimpleResult.java @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import java.util.Iterator; import java.util.List; -import org.neo4j.driver.Record; -import org.neo4j.driver.Result; -import org.neo4j.driver.ResultSummary; -import org.neo4j.driver.ReusableResult; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.Record; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.ResultSummary; +import org.neo4j.driver.v1.ReusableResult; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; public class SimpleResult implements Result { diff --git a/driver/src/main/java/org/neo4j/driver/internal/StandardSession.java b/driver/src/main/java/org/neo4j/driver/v1/internal/StandardSession.java similarity index 88% rename from driver/src/main/java/org/neo4j/driver/internal/StandardSession.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/StandardSession.java index ed9ce43746..a0314c561d 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/StandardSession.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/StandardSession.java @@ -16,18 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import java.util.Map; -import org.neo4j.driver.Result; -import org.neo4j.driver.Session; -import org.neo4j.driver.Statement; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.spi.Connection; -import org.neo4j.driver.internal.summary.ResultBuilder; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.Statement; +import org.neo4j.driver.v1.Transaction; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.spi.Connection; +import org.neo4j.driver.v1.internal.summary.ResultBuilder; public class StandardSession implements Session { diff --git a/driver/src/main/java/org/neo4j/driver/internal/StandardTransaction.java b/driver/src/main/java/org/neo4j/driver/v1/internal/StandardTransaction.java similarity index 91% rename from driver/src/main/java/org/neo4j/driver/internal/StandardTransaction.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/StandardTransaction.java index b822dbb7e5..3da4a606c3 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/StandardTransaction.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/StandardTransaction.java @@ -16,19 +16,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import java.util.Collections; import java.util.Map; -import org.neo4j.driver.Result; -import org.neo4j.driver.Statement; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.exceptions.Neo4jException; -import org.neo4j.driver.internal.spi.Connection; -import org.neo4j.driver.internal.summary.ResultBuilder; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Statement; +import org.neo4j.driver.v1.Transaction; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.Neo4jException; +import org.neo4j.driver.v1.internal.spi.Connection; +import org.neo4j.driver.v1.internal.summary.ResultBuilder; public class StandardTransaction implements Transaction { diff --git a/driver/src/main/java/org/neo4j/driver/internal/Version.java b/driver/src/main/java/org/neo4j/driver/v1/internal/Version.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/internal/Version.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/Version.java index a46c135788..49fafe958c 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/Version.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/Version.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; -import org.neo4j.driver.Session; +import org.neo4j.driver.v1.Session; public class Version { diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/AllOrNothingChannel.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/AllOrNothingChannel.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/AllOrNothingChannel.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/AllOrNothingChannel.java index 9a6de072e3..222fdb8b29 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/AllOrNothingChannel.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/AllOrNothingChannel.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ByteChannel; import java.nio.channels.SocketChannel; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.util.BytePrinter; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.util.BytePrinter; /** * Wraps a regular socket channel such that read and write will not return until the full buffers given have been sent diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedInput.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedInput.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedInput.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedInput.java index f2c081e555..54d97352c6 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedInput.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedInput.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.IOException; import java.nio.ByteBuffer; @@ -24,9 +24,9 @@ import java.nio.channels.ClosedByInterruptException; import java.nio.channels.ReadableByteChannel; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.packstream.PackInput; -import org.neo4j.driver.internal.util.BytePrinter; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.packstream.PackInput; +import org.neo4j.driver.v1.internal.util.BytePrinter; import static java.lang.Math.min; diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedOutput.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedOutput.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedOutput.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedOutput.java index c4d9a4fb64..aa0e726233 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedOutput.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedOutput.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.packstream.PackOutput; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.packstream.PackOutput; import static java.lang.Math.max; diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingByteChannel.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/LoggingByteChannel.java similarity index 92% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingByteChannel.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/LoggingByteChannel.java index ebaa187038..d63ea15b4d 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingByteChannel.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/LoggingByteChannel.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.ByteChannel; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.internal.util.BytePrinter; +import org.neo4j.driver.v1.internal.spi.Logger; +import org.neo4j.driver.v1.internal.util.BytePrinter; /** * Basically it is a wrapper to a {@link ByteChannel} with logging enabled to record bytes sent and received over the diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandler.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/LoggingResponseHandler.java similarity index 85% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandler.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/LoggingResponseHandler.java index 0783ed6cf1..0db84a136e 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandler.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/LoggingResponseHandler.java @@ -16,18 +16,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.util.Arrays; import java.util.Map; -import org.neo4j.driver.Value; -import org.neo4j.driver.internal.spi.Logger; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.internal.spi.Logger; -import static org.neo4j.driver.internal.messaging.AckFailureMessage.ACK_FAILURE; -import static org.neo4j.driver.internal.messaging.DiscardAllMessage.DISCARD_ALL; -import static org.neo4j.driver.internal.messaging.IgnoredMessage.IGNORED; -import static org.neo4j.driver.internal.messaging.PullAllMessage.PULL_ALL; +import static org.neo4j.driver.v1.internal.messaging.AckFailureMessage.ACK_FAILURE; +import static org.neo4j.driver.v1.internal.messaging.DiscardAllMessage.DISCARD_ALL; +import static org.neo4j.driver.v1.internal.messaging.IgnoredMessage.IGNORED; +import static org.neo4j.driver.v1.internal.messaging.PullAllMessage.PULL_ALL; public class LoggingResponseHandler extends SocketResponseHandler { diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLContextFactory.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SSLContextFactory.java similarity index 88% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLContextFactory.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SSLContextFactory.java index a2ead8eac9..96c48877da 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLContextFactory.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SSLContextFactory.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.IOException; import java.security.GeneralSecurityException; @@ -26,18 +26,18 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; -import org.neo4j.driver.Config.TlsAuthenticationConfig; +import org.neo4j.driver.v1.Config; -import static org.neo4j.driver.internal.util.CertificateTool.loadX509Cert; +import static org.neo4j.driver.v1.internal.util.CertificateTool.loadX509Cert; class SSLContextFactory { private final String host; private final int port; - private final TlsAuthenticationConfig authConfig; + private final Config.TlsAuthenticationConfig authConfig; - SSLContextFactory( String host, int port, TlsAuthenticationConfig authConfig ) + SSLContextFactory( String host, int port, Config.TlsAuthenticationConfig authConfig ) { this.host = host; this.port = port; diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannel.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SSLSocketChannel.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannel.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SSLSocketChannel.java index 4e4052310a..019ab3c7d5 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannel.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SSLSocketChannel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.IOException; import java.nio.ByteBuffer; @@ -30,10 +30,10 @@ import javax.net.ssl.SSLEngineResult.Status; import javax.net.ssl.SSLSession; -import org.neo4j.driver.Config.TlsAuthenticationConfig; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.internal.util.BytePrinter; +import org.neo4j.driver.v1.Config.TlsAuthenticationConfig; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.spi.Logger; +import org.neo4j.driver.v1.internal.util.BytePrinter; import static javax.net.ssl.SSLEngineResult.HandshakeStatus.FINISHED; import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING; diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketClient.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketClient.java similarity index 93% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketClient.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketClient.java index cc4f4a9847..c766300ba7 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketClient.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketClient.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.IOException; import java.net.ConnectException; @@ -28,12 +28,11 @@ import java.security.GeneralSecurityException; import java.util.List; -import org.neo4j.driver.Config; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.messaging.Message; -import org.neo4j.driver.internal.messaging.MessageFormat.Reader; -import org.neo4j.driver.internal.messaging.MessageFormat.Writer; -import org.neo4j.driver.internal.spi.Logger; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.messaging.Message; +import org.neo4j.driver.v1.internal.spi.Logger; +import org.neo4j.driver.v1.internal.messaging.MessageFormat; public class SocketClient { @@ -43,8 +42,8 @@ public class SocketClient protected final Config config; private SocketProtocol protocol; - private Reader reader; - private Writer writer; + private MessageFormat.Reader reader; + private MessageFormat.Writer writer; private ByteChannel channel; diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketConnection.java similarity index 84% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketConnection.java index 5bb4d34031..f4f137d297 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketConnection.java @@ -16,26 +16,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.IOException; import java.net.SocketTimeoutException; import java.util.LinkedList; import java.util.Map; -import org.neo4j.driver.Config; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.messaging.AckFailureMessage; -import org.neo4j.driver.internal.messaging.InitMessage; -import org.neo4j.driver.internal.messaging.Message; -import org.neo4j.driver.internal.messaging.RunMessage; -import org.neo4j.driver.internal.spi.Connection; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.internal.spi.StreamCollector; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.messaging.AckFailureMessage; +import org.neo4j.driver.v1.internal.messaging.InitMessage; +import org.neo4j.driver.v1.internal.messaging.Message; +import org.neo4j.driver.v1.internal.messaging.RunMessage; +import org.neo4j.driver.v1.internal.spi.Connection; +import org.neo4j.driver.v1.internal.spi.Logger; +import org.neo4j.driver.v1.internal.spi.StreamCollector; +import org.neo4j.driver.v1.internal.messaging.PullAllMessage; -import static org.neo4j.driver.internal.messaging.DiscardAllMessage.DISCARD_ALL; -import static org.neo4j.driver.internal.messaging.PullAllMessage.PULL_ALL; +import static org.neo4j.driver.v1.internal.messaging.DiscardAllMessage.DISCARD_ALL; public class SocketConnection implements Connection { @@ -90,7 +90,7 @@ public void discardAll() @Override public void pullAll( StreamCollector collector ) { - int messageId = queueMessage( PULL_ALL ); + int messageId = queueMessage( PullAllMessage.PULL_ALL ); responseHandler.registerResultCollector( messageId, collector ); } diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnector.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketConnector.java similarity index 83% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnector.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketConnector.java index 8b3d599f99..4f682bfe08 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnector.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketConnector.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.net.URI; import java.util.Collection; -import org.neo4j.driver.Config; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.Version; -import org.neo4j.driver.internal.spi.Connection; -import org.neo4j.driver.internal.spi.Connector; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.Version; +import org.neo4j.driver.v1.internal.spi.Connection; +import org.neo4j.driver.v1.internal.spi.Connector; import static java.util.Arrays.asList; diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketProtocol.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketProtocol.java similarity index 80% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketProtocol.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketProtocol.java index 261d3720df..6a1d3a6847 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketProtocol.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketProtocol.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; -import org.neo4j.driver.internal.messaging.MessageFormat.Reader; -import org.neo4j.driver.internal.messaging.MessageFormat.Writer; +import org.neo4j.driver.v1.internal.messaging.MessageFormat.Reader; +import org.neo4j.driver.v1.internal.messaging.MessageFormat.Writer; public interface SocketProtocol { diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketProtocolV1.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketProtocolV1.java similarity index 83% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketProtocolV1.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketProtocolV1.java index 0918caec76..2ab63df3fd 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketProtocolV1.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketProtocolV1.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.IOException; import java.nio.channels.ByteChannel; -import org.neo4j.driver.internal.messaging.MessageFormat; -import org.neo4j.driver.internal.messaging.MessageFormat.Reader; -import org.neo4j.driver.internal.messaging.MessageFormat.Writer; -import org.neo4j.driver.internal.messaging.PackStreamMessageFormatV1; +import org.neo4j.driver.v1.internal.messaging.MessageFormat; +import org.neo4j.driver.v1.internal.messaging.MessageFormat.Reader; +import org.neo4j.driver.v1.internal.messaging.MessageFormat.Writer; +import org.neo4j.driver.v1.internal.messaging.PackStreamMessageFormatV1; public class SocketProtocolV1 implements SocketProtocol { diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandler.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketResponseHandler.java similarity index 89% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandler.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketResponseHandler.java index cfdd6fecd8..ffb277ac90 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandler.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/SocketResponseHandler.java @@ -16,23 +16,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.util.HashMap; import java.util.Map; -import org.neo4j.driver.StatementType; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.exceptions.DatabaseException; -import org.neo4j.driver.exceptions.Neo4jException; -import org.neo4j.driver.exceptions.TransientException; -import org.neo4j.driver.internal.summary.SimpleNotification; -import org.neo4j.driver.internal.summary.SimplePlan; -import org.neo4j.driver.internal.summary.SimpleProfiledPlan; -import org.neo4j.driver.internal.summary.SimpleUpdateStatistics; -import org.neo4j.driver.internal.messaging.MessageHandler; -import org.neo4j.driver.internal.spi.StreamCollector; +import org.neo4j.driver.v1.StatementType; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.DatabaseException; +import org.neo4j.driver.v1.exceptions.Neo4jException; +import org.neo4j.driver.v1.exceptions.TransientException; +import org.neo4j.driver.v1.internal.summary.SimpleNotification; +import org.neo4j.driver.v1.internal.summary.SimplePlan; +import org.neo4j.driver.v1.internal.summary.SimpleProfiledPlan; +import org.neo4j.driver.v1.internal.summary.SimpleUpdateStatistics; +import org.neo4j.driver.v1.internal.messaging.MessageHandler; +import org.neo4j.driver.v1.internal.spi.StreamCollector; public class SocketResponseHandler implements MessageHandler { diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/TrustOnFirstUseTrustManager.java b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/TrustOnFirstUseTrustManager.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/connector/socket/TrustOnFirstUseTrustManager.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/TrustOnFirstUseTrustManager.java index 2ca32a5e58..ed4f50b343 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/TrustOnFirstUseTrustManager.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/connector/socket/TrustOnFirstUseTrustManager.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -30,7 +30,7 @@ import javax.net.ssl.X509TrustManager; import javax.xml.bind.DatatypeConverter; -import static org.neo4j.driver.internal.util.CertificateTool.X509CertToString; +import static org.neo4j.driver.v1.internal.util.CertificateTool.X509CertToString; /** * References: diff --git a/driver/src/main/java/org/neo4j/driver/internal/logging/ConsoleLogging.java b/driver/src/main/java/org/neo4j/driver/v1/internal/logging/ConsoleLogging.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/logging/ConsoleLogging.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/logging/ConsoleLogging.java index 52b995c3bf..4f79d53234 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/ConsoleLogging.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/logging/ConsoleLogging.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.logging; +package org.neo4j.driver.v1.internal.logging; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -27,8 +27,8 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.internal.spi.Logging; +import org.neo4j.driver.v1.internal.spi.Logger; +import org.neo4j.driver.v1.internal.spi.Logging; /** * Print all the logging messages into {@link System#err}. diff --git a/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java b/driver/src/main/java/org/neo4j/driver/v1/internal/logging/DevNullLogger.java similarity index 93% rename from driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/logging/DevNullLogger.java index a1aed773dd..9c9e995f3a 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/logging/DevNullLogger.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.logging; +package org.neo4j.driver.v1.internal.logging; -import org.neo4j.driver.internal.spi.Logger; +import org.neo4j.driver.v1.internal.spi.Logger; public class DevNullLogger implements Logger { diff --git a/driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java b/driver/src/main/java/org/neo4j/driver/v1/internal/logging/JULogger.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/logging/JULogger.java index 0f391f50ec..5a18f9374f 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/logging/JULogger.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.logging; +package org.neo4j.driver.v1.internal.logging; import java.util.logging.Level; -import org.neo4j.driver.internal.spi.Logger; +import org.neo4j.driver.v1.internal.spi.Logger; public class JULogger implements Logger { diff --git a/driver/src/main/java/org/neo4j/driver/internal/logging/JULogging.java b/driver/src/main/java/org/neo4j/driver/v1/internal/logging/JULogging.java similarity index 87% rename from driver/src/main/java/org/neo4j/driver/internal/logging/JULogging.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/logging/JULogging.java index ebf4904699..55d7f703e0 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/JULogging.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/logging/JULogging.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.logging; +package org.neo4j.driver.v1.internal.logging; import java.util.logging.Level; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.internal.spi.Logging; +import org.neo4j.driver.v1.internal.spi.Logger; +import org.neo4j.driver.v1.internal.spi.Logging; public class JULogging implements Logging { diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/AckFailureMessage.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/AckFailureMessage.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/AckFailureMessage.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/AckFailureMessage.java index 4e874e80bd..79da698aa8 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/AckFailureMessage.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/AckFailureMessage.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/DiscardAllMessage.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/DiscardAllMessage.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/DiscardAllMessage.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/DiscardAllMessage.java index dd68454a64..63cdcd2130 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/DiscardAllMessage.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/DiscardAllMessage.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/FailureMessage.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/FailureMessage.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/FailureMessage.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/FailureMessage.java index c25b29edc1..19e03a1d75 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/FailureMessage.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/FailureMessage.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/IgnoredMessage.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/IgnoredMessage.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/IgnoredMessage.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/IgnoredMessage.java index ecd4863407..664852e4c9 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/IgnoredMessage.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/IgnoredMessage.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/InitMessage.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/InitMessage.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/InitMessage.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/InitMessage.java index c0f9fafbf0..7b1d1c1830 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/InitMessage.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/InitMessage.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/Message.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/Message.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/Message.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/Message.java index fde5d4e68a..b75e42ac01 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/Message.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/Message.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/MessageFormat.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/MessageFormat.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/MessageFormat.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/MessageFormat.java index 4ff2d0bc87..fd038475eb 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/MessageFormat.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/MessageFormat.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; import java.nio.channels.ReadableByteChannel; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/MessageHandler.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/MessageHandler.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/MessageHandler.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/MessageHandler.java index f0707ce645..4b5d18c7fd 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/MessageHandler.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/MessageHandler.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; import java.util.Map; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; public interface MessageHandler { diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/PackStreamMessageFormatV1.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/PackStreamMessageFormatV1.java index b93c96a03d..fc07f29d44 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/PackStreamMessageFormatV1.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; import java.nio.channels.ReadableByteChannel; @@ -28,32 +28,32 @@ import java.util.List; import java.util.Map; -import org.neo4j.driver.Entity; -import org.neo4j.driver.Identity; -import org.neo4j.driver.Node; -import org.neo4j.driver.Path; -import org.neo4j.driver.Relationship; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.Identities; -import org.neo4j.driver.internal.SimpleNode; -import org.neo4j.driver.internal.SimplePath; -import org.neo4j.driver.internal.SimpleRelationship; -import org.neo4j.driver.internal.connector.socket.ChunkedInput; -import org.neo4j.driver.internal.connector.socket.ChunkedOutput; -import org.neo4j.driver.internal.packstream.BufferedChannelOutput; -import org.neo4j.driver.internal.packstream.PackInput; -import org.neo4j.driver.internal.packstream.PackOutput; -import org.neo4j.driver.internal.packstream.PackStream; -import org.neo4j.driver.internal.packstream.PackType; -import org.neo4j.driver.internal.util.Iterables; -import org.neo4j.driver.internal.value.ListValue; -import org.neo4j.driver.internal.value.MapValue; -import org.neo4j.driver.internal.value.NodeValue; -import org.neo4j.driver.internal.value.PathValue; -import org.neo4j.driver.internal.value.RelationshipValue; - -import static org.neo4j.driver.Values.value; +import org.neo4j.driver.v1.Entity; +import org.neo4j.driver.v1.Identity; +import org.neo4j.driver.v1.Node; +import org.neo4j.driver.v1.Path; +import org.neo4j.driver.v1.Relationship; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.Identities; +import org.neo4j.driver.v1.internal.SimpleNode; +import org.neo4j.driver.v1.internal.SimplePath; +import org.neo4j.driver.v1.internal.SimpleRelationship; +import org.neo4j.driver.v1.internal.connector.socket.ChunkedInput; +import org.neo4j.driver.v1.internal.connector.socket.ChunkedOutput; +import org.neo4j.driver.v1.internal.packstream.BufferedChannelOutput; +import org.neo4j.driver.v1.internal.packstream.PackInput; +import org.neo4j.driver.v1.internal.packstream.PackOutput; +import org.neo4j.driver.v1.internal.packstream.PackStream; +import org.neo4j.driver.v1.internal.packstream.PackType; +import org.neo4j.driver.v1.internal.util.Iterables; +import org.neo4j.driver.v1.internal.value.ListValue; +import org.neo4j.driver.v1.internal.value.MapValue; +import org.neo4j.driver.v1.internal.value.NodeValue; +import org.neo4j.driver.v1.internal.value.PathValue; +import org.neo4j.driver.v1.internal.value.RelationshipValue; + +import static org.neo4j.driver.v1.Values.value; public class PackStreamMessageFormatV1 implements MessageFormat { diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/PullAllMessage.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/PullAllMessage.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/PullAllMessage.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/PullAllMessage.java index 21fb47ac3e..2674244142 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/PullAllMessage.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/PullAllMessage.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/RecordMessage.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/RecordMessage.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/RecordMessage.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/RecordMessage.java index a4fa86ae86..86f5e38d98 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/RecordMessage.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/RecordMessage.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; import java.util.Arrays; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; public class RecordMessage implements Message { diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/RunMessage.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/RunMessage.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/RunMessage.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/RunMessage.java index a0fea906c3..051750183e 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/RunMessage.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/RunMessage.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; import java.util.Map; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; import static java.lang.String.format; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/SuccessMessage.java b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/SuccessMessage.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/internal/messaging/SuccessMessage.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/messaging/SuccessMessage.java index e85db61e3a..cfb93b5e50 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/SuccessMessage.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/messaging/SuccessMessage.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import java.io.IOException; import java.util.Map; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; import static java.lang.String.format; diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelInput.java b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/BufferedChannelInput.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelInput.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/packstream/BufferedChannelInput.java index 5e28de9a24..1db8f0a9de 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelInput.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/BufferedChannelInput.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.packstream; +package org.neo4j.driver.v1.internal.packstream; import java.io.IOException; import java.nio.ByteBuffer; @@ -155,4 +155,4 @@ private void ensure( int numBytes ) throws IOException throw new PackStream.EndOfStream( "Unexpected end of stream while trying to read " + numBytes + " bytes." ); } } -} \ No newline at end of file +} diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelOutput.java b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/BufferedChannelOutput.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelOutput.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/packstream/BufferedChannelOutput.java index 0327d85238..d9c1aad06c 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelOutput.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/BufferedChannelOutput.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.packstream; +package org.neo4j.driver.v1.internal.packstream; import java.io.IOException; import java.nio.ByteBuffer; @@ -124,4 +124,4 @@ private void ensure( int size ) throws IOException flush(); } } -} \ No newline at end of file +} diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackInput.java b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackInput.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/packstream/PackInput.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackInput.java index c01550d9d1..ec212233d7 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackInput.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackInput.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.packstream; +package org.neo4j.driver.v1.internal.packstream; import java.io.IOException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackOutput.java b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackOutput.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/packstream/PackOutput.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackOutput.java index 4c41878ced..4867a6d19a 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackOutput.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackOutput.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.packstream; +package org.neo4j.driver.v1.internal.packstream; import java.io.IOException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackStream.java similarity index 99% rename from driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackStream.java index 4c0a1824fd..aa9001d6eb 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackStream.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.packstream; +package org.neo4j.driver.v1.internal.packstream; import java.io.IOException; import java.nio.channels.ReadableByteChannel; @@ -33,13 +33,13 @@ * PackStream is a messaging serialisation format heavily inspired by MessagePack. * The key differences are in the type system itself which (among other things) replaces extensions with structures. * The Packer and Unpacker implementations are also faster than their MessagePack counterparts. - * + * * Note that several marker byte values are RESERVED for future use. * Extra markers should not be added casually and such additions must be follow a strict process involving both client and server software. - * + * * The table below shows all allocated marker byte values. * - * + *
* * * @@ -82,7 +82,7 @@ */ public class PackStream { - + public static final byte TINY_STRING = (byte) 0x80; public static final byte TINY_LIST = (byte) 0x90; public static final byte TINY_MAP = (byte) 0xA0; diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackType.java b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackType.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/internal/packstream/PackType.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackType.java index 37838f6ea5..919a090e79 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackType.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/packstream/PackType.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.packstream; +package org.neo4j.driver.v1.internal.packstream; public enum PackType { diff --git a/driver/src/main/java/org/neo4j/driver/internal/pool/Allocator.java b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/Allocator.java similarity index 87% rename from driver/src/main/java/org/neo4j/driver/internal/pool/Allocator.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/pool/Allocator.java index 5cbd660a34..1154de6be5 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/Allocator.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/Allocator.java @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.pool; +package org.neo4j.driver.v1.internal.pool; -import org.neo4j.driver.exceptions.Neo4jException; -import org.neo4j.driver.internal.util.Consumer; +import org.neo4j.driver.v1.exceptions.Neo4jException; +import org.neo4j.driver.v1.internal.util.Consumer; public interface Allocator { @@ -29,7 +29,7 @@ public interface Allocator * implement a 'close' method which calls the release handle. * * It is legal for the allocator to fail to allocate a new item. To signal that allocation failed, the allocator - * should throw a {@link org.neo4j.driver.exceptions.Neo4jException} + * should throw a {@link Neo4jException} */ Value allocate( Consumer release ) throws Neo4jException; diff --git a/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnection.java b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/PooledConnection.java similarity index 92% rename from driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnection.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/pool/PooledConnection.java index 4d58b8bcdc..8ff47d93a3 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnection.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/PooledConnection.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.pool; +package org.neo4j.driver.v1.internal.pool; import java.util.Map; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.Neo4jException; -import org.neo4j.driver.internal.spi.Connection; -import org.neo4j.driver.internal.spi.StreamCollector; -import org.neo4j.driver.internal.util.Consumer; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.Neo4jException; +import org.neo4j.driver.v1.internal.spi.Connection; +import org.neo4j.driver.v1.internal.spi.StreamCollector; +import org.neo4j.driver.v1.internal.util.Consumer; public class PooledConnection implements Connection { diff --git a/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnectionValidator.java b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/PooledConnectionValidator.java similarity index 93% rename from driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnectionValidator.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/pool/PooledConnectionValidator.java index a8f86cfb2c..cf45b261ee 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnectionValidator.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/PooledConnectionValidator.java @@ -16,13 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.pool; +package org.neo4j.driver.v1.internal.pool; import java.util.HashMap; import java.util.Map; -import org.neo4j.driver.Value; -import org.neo4j.driver.internal.spi.StreamCollector; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.internal.spi.StreamCollector; /** * Validates connections - determining if they are ok to keep in the pool, or if they should be disposed of. diff --git a/driver/src/main/java/org/neo4j/driver/internal/pool/StandardConnectionPool.java b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/StandardConnectionPool.java similarity index 93% rename from driver/src/main/java/org/neo4j/driver/internal/pool/StandardConnectionPool.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/pool/StandardConnectionPool.java index 6d2eaf7e93..bf220ffbbe 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/StandardConnectionPool.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/StandardConnectionPool.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.pool; +package org.neo4j.driver.v1.internal.pool; import java.net.URI; import java.util.Arrays; @@ -27,14 +27,14 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import org.neo4j.driver.Config; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.connector.socket.SocketConnector; -import org.neo4j.driver.internal.spi.Connection; -import org.neo4j.driver.internal.spi.ConnectionPool; -import org.neo4j.driver.internal.spi.Connector; -import org.neo4j.driver.internal.util.Clock; -import org.neo4j.driver.internal.util.Consumer; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.connector.socket.SocketConnector; +import org.neo4j.driver.v1.internal.spi.Connection; +import org.neo4j.driver.v1.internal.spi.ConnectionPool; +import org.neo4j.driver.v1.internal.spi.Connector; +import org.neo4j.driver.v1.internal.util.Clock; +import org.neo4j.driver.v1.internal.util.Consumer; /** * A basic connection pool that optimizes for threads being long-lived, acquiring/releasing many connections. diff --git a/driver/src/main/java/org/neo4j/driver/internal/pool/ThreadCachingPool.java b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/ThreadCachingPool.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/internal/pool/ThreadCachingPool.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/pool/ThreadCachingPool.java index dd0c28a1a8..34e102f3f9 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/ThreadCachingPool.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/ThreadCachingPool.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.pool; +package org.neo4j.driver.v1.internal.pool; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -25,9 +25,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.neo4j.driver.exceptions.Neo4jException; -import org.neo4j.driver.internal.util.Clock; -import org.neo4j.driver.internal.util.Consumer; +import org.neo4j.driver.v1.exceptions.Neo4jException; +import org.neo4j.driver.v1.internal.util.Clock; +import org.neo4j.driver.v1.internal.util.Consumer; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -363,4 +363,4 @@ public String toString() ", state=" + state.get() + '}'; } -} \ No newline at end of file +} diff --git a/driver/src/main/java/org/neo4j/driver/internal/pool/ValidationStrategy.java b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/ValidationStrategy.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/internal/pool/ValidationStrategy.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/pool/ValidationStrategy.java index 4c2bbe9bf4..a55f40359e 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/ValidationStrategy.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/pool/ValidationStrategy.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.pool; +package org.neo4j.driver.v1.internal.pool; public interface ValidationStrategy { diff --git a/driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/Connection.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/spi/Connection.java index dec77ed17f..17a5452a58 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/Connection.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.spi; +package org.neo4j.driver.v1.internal.spi; import java.util.Map; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; /** * A connection is an abstraction provided by an underlying transport implementation, diff --git a/driver/src/main/java/org/neo4j/driver/internal/spi/ConnectionPool.java b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/ConnectionPool.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/spi/ConnectionPool.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/spi/ConnectionPool.java index 5c63cbe527..8b719e01bc 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/ConnectionPool.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/ConnectionPool.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.spi; +package org.neo4j.driver.v1.internal.spi; import java.net.URI; diff --git a/driver/src/main/java/org/neo4j/driver/internal/spi/Connector.java b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/Connector.java similarity index 92% rename from driver/src/main/java/org/neo4j/driver/internal/spi/Connector.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/spi/Connector.java index 8e1813b64f..486174bb5d 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/Connector.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/Connector.java @@ -16,13 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.spi; +package org.neo4j.driver.v1.internal.spi; import java.net.URI; import java.util.Collection; -import org.neo4j.driver.Config; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.exceptions.ClientException; /** * A Connector conducts the client side of a client-server dialogue, diff --git a/driver/src/main/java/org/neo4j/driver/internal/spi/Logger.java b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/Logger.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/spi/Logger.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/spi/Logger.java index a34a3eb11f..86be9764a1 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/Logger.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/Logger.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.spi; +package org.neo4j.driver.v1.internal.spi; public interface Logger { diff --git a/driver/src/main/java/org/neo4j/driver/internal/spi/Logging.java b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/Logging.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/internal/spi/Logging.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/spi/Logging.java index c0821e98ae..fff5b9e172 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/Logging.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/Logging.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.spi; +package org.neo4j.driver.v1.internal.spi; public interface Logging { diff --git a/driver/src/main/java/org/neo4j/driver/internal/spi/StreamCollector.java b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/StreamCollector.java similarity index 87% rename from driver/src/main/java/org/neo4j/driver/internal/spi/StreamCollector.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/spi/StreamCollector.java index d5acc1d284..f79623b7b7 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/StreamCollector.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/spi/StreamCollector.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.spi; +package org.neo4j.driver.v1.internal.spi; import java.util.List; -import org.neo4j.driver.Notification; -import org.neo4j.driver.Plan; -import org.neo4j.driver.ProfiledPlan; -import org.neo4j.driver.StatementType; -import org.neo4j.driver.UpdateStatistics; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Notification; +import org.neo4j.driver.v1.Plan; +import org.neo4j.driver.v1.ProfiledPlan; +import org.neo4j.driver.v1.StatementType; +import org.neo4j.driver.v1.UpdateStatistics; +import org.neo4j.driver.v1.Value; public interface StreamCollector { diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/ResultBuilder.java b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/ResultBuilder.java similarity index 82% rename from driver/src/main/java/org/neo4j/driver/internal/summary/ResultBuilder.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/summary/ResultBuilder.java index af11a8b23d..a05b075398 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/ResultBuilder.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/ResultBuilder.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.summary; +package org.neo4j.driver.v1.internal.summary; import java.util.ArrayList; import java.util.Collections; @@ -25,22 +25,22 @@ import java.util.Map; import java.util.Set; -import org.neo4j.driver.Notification; -import org.neo4j.driver.Plan; -import org.neo4j.driver.ProfiledPlan; -import org.neo4j.driver.Record; -import org.neo4j.driver.Result; -import org.neo4j.driver.Statement; -import org.neo4j.driver.StatementType; -import org.neo4j.driver.UpdateStatistics; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.SimpleRecord; -import org.neo4j.driver.internal.SimpleResult; -import org.neo4j.driver.internal.spi.StreamCollector; +import org.neo4j.driver.v1.Notification; +import org.neo4j.driver.v1.Plan; +import org.neo4j.driver.v1.ProfiledPlan; +import org.neo4j.driver.v1.Record; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Statement; +import org.neo4j.driver.v1.StatementType; +import org.neo4j.driver.v1.UpdateStatistics; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.SimpleRecord; +import org.neo4j.driver.v1.internal.SimpleResult; +import org.neo4j.driver.v1.internal.spi.StreamCollector; import static java.util.Collections.unmodifiableMap; -import static org.neo4j.driver.internal.ParameterSupport.NO_PARAMETERS; +import static org.neo4j.driver.v1.internal.ParameterSupport.NO_PARAMETERS; public class ResultBuilder implements StreamCollector { diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleInputPosition.java b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleInputPosition.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/internal/summary/SimpleInputPosition.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleInputPosition.java index 8b80697c4e..f0f0f1bcbf 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleInputPosition.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleInputPosition.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.summary; +package org.neo4j.driver.v1.internal.summary; -import org.neo4j.driver.InputPosition; +import org.neo4j.driver.v1.InputPosition; /** * An input position refers to a specific point in a query string. diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleNotification.java b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleNotification.java similarity index 93% rename from driver/src/main/java/org/neo4j/driver/internal/summary/SimpleNotification.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleNotification.java index 8aa929b2cd..c173036aad 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleNotification.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleNotification.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.summary; +package org.neo4j.driver.v1.internal.summary; -import org.neo4j.driver.Function; -import org.neo4j.driver.InputPosition; -import org.neo4j.driver.Notification; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Function; +import org.neo4j.driver.v1.InputPosition; +import org.neo4j.driver.v1.Notification; +import org.neo4j.driver.v1.Value; public class SimpleNotification implements Notification { diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/SimplePlan.java b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimplePlan.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/internal/summary/SimplePlan.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimplePlan.java index d815c7c0ff..cd5c8e2669 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimplePlan.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimplePlan.java @@ -16,19 +16,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.summary; +package org.neo4j.driver.v1.internal.summary; import java.util.Collections; import java.util.List; import java.util.Map; -import org.neo4j.driver.Function; -import org.neo4j.driver.Plan; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Function; +import org.neo4j.driver.v1.Plan; +import org.neo4j.driver.v1.Value; import static java.lang.String.format; -import static org.neo4j.driver.Values.valueAsIs; -import static org.neo4j.driver.Values.valueToString; +import static org.neo4j.driver.v1.Values.valueAsIs; +import static org.neo4j.driver.v1.Values.valueToString; public class SimplePlan implements Plan { diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleProfiledPlan.java b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleProfiledPlan.java similarity index 93% rename from driver/src/main/java/org/neo4j/driver/internal/summary/SimpleProfiledPlan.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleProfiledPlan.java index b7ad1874d8..3045de1aa3 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleProfiledPlan.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleProfiledPlan.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.summary; +package org.neo4j.driver.v1.internal.summary; import java.util.List; import java.util.Map; -import org.neo4j.driver.Function; -import org.neo4j.driver.ProfiledPlan; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Function; +import org.neo4j.driver.v1.ProfiledPlan; +import org.neo4j.driver.v1.Value; public class SimpleProfiledPlan extends SimplePlan implements ProfiledPlan { diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleUpdateStatistics.java b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleUpdateStatistics.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/internal/summary/SimpleUpdateStatistics.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleUpdateStatistics.java index c392578a2f..5e7bbed13b 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleUpdateStatistics.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SimpleUpdateStatistics.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.summary; +package org.neo4j.driver.v1.internal.summary; -import org.neo4j.driver.UpdateStatistics; +import org.neo4j.driver.v1.UpdateStatistics; public class SimpleUpdateStatistics implements UpdateStatistics { diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/SummaryBuilder.java b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SummaryBuilder.java similarity index 86% rename from driver/src/main/java/org/neo4j/driver/internal/summary/SummaryBuilder.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/summary/SummaryBuilder.java index 2507b54da0..8cca2e9e41 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SummaryBuilder.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/summary/SummaryBuilder.java @@ -16,23 +16,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.summary; +package org.neo4j.driver.v1.internal.summary; import java.util.ArrayList; import java.util.List; -import org.neo4j.driver.Notification; -import org.neo4j.driver.Plan; -import org.neo4j.driver.ProfiledPlan; -import org.neo4j.driver.ResultSummary; -import org.neo4j.driver.Statement; -import org.neo4j.driver.StatementType; -import org.neo4j.driver.UpdateStatistics; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.spi.StreamCollector; - -import static org.neo4j.driver.internal.summary.SimpleUpdateStatistics.EMPTY_STATS; +import org.neo4j.driver.v1.Notification; +import org.neo4j.driver.v1.Plan; +import org.neo4j.driver.v1.ProfiledPlan; +import org.neo4j.driver.v1.ResultSummary; +import org.neo4j.driver.v1.Statement; +import org.neo4j.driver.v1.StatementType; +import org.neo4j.driver.v1.UpdateStatistics; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.spi.StreamCollector; public class SummaryBuilder implements StreamCollector { @@ -138,7 +136,7 @@ public Statement statement() @Override public UpdateStatistics updateStatistics() { - return statistics == null ? EMPTY_STATS : statistics; + return statistics == null ? SimpleUpdateStatistics.EMPTY_STATS : statistics; } @Override diff --git a/driver/src/main/java/org/neo4j/driver/internal/util/BytePrinter.java b/driver/src/main/java/org/neo4j/driver/v1/internal/util/BytePrinter.java similarity index 99% rename from driver/src/main/java/org/neo4j/driver/internal/util/BytePrinter.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/util/BytePrinter.java index 47819ad56b..89629fce64 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/util/BytePrinter.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/util/BytePrinter.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.util; +package org.neo4j.driver.v1.internal.util; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/driver/src/main/java/org/neo4j/driver/internal/util/CertificateTool.java b/driver/src/main/java/org/neo4j/driver/v1/internal/util/CertificateTool.java similarity index 99% rename from driver/src/main/java/org/neo4j/driver/internal/util/CertificateTool.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/util/CertificateTool.java index 32d7bf885f..a8df94c37a 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/util/CertificateTool.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/util/CertificateTool.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.util; +package org.neo4j.driver.v1.internal.util; import java.io.BufferedInputStream; import java.io.BufferedWriter; diff --git a/driver/src/main/java/org/neo4j/driver/internal/util/Clock.java b/driver/src/main/java/org/neo4j/driver/v1/internal/util/Clock.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/util/Clock.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/util/Clock.java index 27c018a1f6..04ded51d77 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/util/Clock.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/util/Clock.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.util; +package org.neo4j.driver.v1.internal.util; /** * Since {@link java.time.Clock} is only available in Java 8, use our own until we drop java 7 support. diff --git a/driver/src/main/java/org/neo4j/driver/internal/util/Consumer.java b/driver/src/main/java/org/neo4j/driver/v1/internal/util/Consumer.java similarity index 94% rename from driver/src/main/java/org/neo4j/driver/internal/util/Consumer.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/util/Consumer.java index a1110bf025..51e8c5ee7a 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/util/Consumer.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/util/Consumer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.util; +package org.neo4j.driver.v1.internal.util; public interface Consumer { diff --git a/driver/src/main/java/org/neo4j/driver/internal/util/Iterables.java b/driver/src/main/java/org/neo4j/driver/v1/internal/util/Iterables.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/util/Iterables.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/util/Iterables.java index c3c668542e..a3e7e1377e 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/util/Iterables.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/util/Iterables.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.util; +package org.neo4j.driver.v1.internal.util; import java.util.ArrayList; import java.util.Collection; diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/BooleanValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/BooleanValue.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/value/BooleanValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/BooleanValue.java index 9a2d38ae60..d411d37c2f 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/BooleanValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/BooleanValue.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; public class BooleanValue extends ValueAdapter { diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/FloatValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/FloatValue.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/value/FloatValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/FloatValue.java index a42e872f60..30faa195b5 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/FloatValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/FloatValue.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; public class FloatValue extends ValueAdapter { diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/IdentityValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/IdentityValue.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/internal/value/IdentityValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/IdentityValue.java index 93cee57e69..4926a2a050 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/IdentityValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/IdentityValue.java @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; -import org.neo4j.driver.Identity; +import org.neo4j.driver.v1.Identity; public class IdentityValue extends ValueAdapter { diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/IntegerValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/IntegerValue.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/value/IntegerValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/IntegerValue.java index fe3c4a4278..9e20941182 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/IntegerValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/IntegerValue.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; public class IntegerValue extends ValueAdapter { diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/ListValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/ListValue.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/internal/value/ListValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/ListValue.java index 1f733a8376..7435ab4335 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/ListValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/ListValue.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.neo4j.driver.Value; -import org.neo4j.driver.Function; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.Function; public class ListValue extends ValueAdapter { diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/MapValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/MapValue.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/value/MapValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/MapValue.java index 7b5058e992..f3920e7599 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/MapValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/MapValue.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import java.util.ArrayList; import java.util.HashMap; @@ -24,8 +24,8 @@ import java.util.List; import java.util.Map; -import org.neo4j.driver.Value; -import org.neo4j.driver.Function; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.Function; public class MapValue extends ValueAdapter { diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/NodeValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/NodeValue.java similarity index 89% rename from driver/src/main/java/org/neo4j/driver/internal/value/NodeValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/NodeValue.java index 0b470c2417..1c850df467 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/NodeValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/NodeValue.java @@ -16,21 +16,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Node; +import org.neo4j.driver.v1.Value; public class NodeValue extends ValueAdapter { - private final org.neo4j.driver.Node adapted; + private final Node adapted; - public NodeValue( org.neo4j.driver.Node adapted ) + public NodeValue( Node adapted ) { this.adapted = adapted; } @Override - public org.neo4j.driver.Node asNode() + public Node asNode() { return adapted; } diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/PathValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/PathValue.java similarity index 88% rename from driver/src/main/java/org/neo4j/driver/internal/value/PathValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/PathValue.java index c6865e66a2..4eb4a722c6 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/PathValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/PathValue.java @@ -16,19 +16,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; + +import org.neo4j.driver.v1.Path; public class PathValue extends ValueAdapter { - private final org.neo4j.driver.Path adapted; + private final Path adapted; - public PathValue( org.neo4j.driver.Path adapted ) + public PathValue( Path adapted ) { this.adapted = adapted; } @Override - public org.neo4j.driver.Path asPath() + public Path asPath() { return adapted; } diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/RelationshipValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/RelationshipValue.java similarity index 88% rename from driver/src/main/java/org/neo4j/driver/internal/value/RelationshipValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/RelationshipValue.java index 3408585424..dba6e7a1b3 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/RelationshipValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/RelationshipValue.java @@ -16,21 +16,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.Relationship; public class RelationshipValue extends ValueAdapter { - private final org.neo4j.driver.Relationship adapted; + private final Relationship adapted; - public RelationshipValue( org.neo4j.driver.Relationship adapted ) + public RelationshipValue( Relationship adapted ) { this.adapted = adapted; } @Override - public org.neo4j.driver.Relationship asRelationship() + public Relationship asRelationship() { return adapted; } diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/StringValue.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/StringValue.java similarity index 97% rename from driver/src/main/java/org/neo4j/driver/internal/value/StringValue.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/StringValue.java index d0abcdbe6e..211aced510 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/StringValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/StringValue.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; public class StringValue extends ValueAdapter { diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java b/driver/src/main/java/org/neo4j/driver/v1/internal/value/ValueAdapter.java similarity index 91% rename from driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java rename to driver/src/main/java/org/neo4j/driver/v1/internal/value/ValueAdapter.java index fdba5dda1a..23a76b05fb 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/value/ValueAdapter.java @@ -16,21 +16,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import java.util.Iterator; import java.util.List; import java.util.Map; -import org.neo4j.driver.Identity; -import org.neo4j.driver.Node; -import org.neo4j.driver.Path; -import org.neo4j.driver.Relationship; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.value.NotMultiValued; -import org.neo4j.driver.exceptions.value.Uncoercible; -import org.neo4j.driver.exceptions.value.Unsizable; -import org.neo4j.driver.Function; +import org.neo4j.driver.v1.Identity; +import org.neo4j.driver.v1.Node; +import org.neo4j.driver.v1.Path; +import org.neo4j.driver.v1.Relationship; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.value.NotMultiValued; +import org.neo4j.driver.v1.exceptions.value.Uncoercible; +import org.neo4j.driver.v1.exceptions.value.Unsizable; +import org.neo4j.driver.v1.Function; import static java.util.Collections.emptyList; diff --git a/driver/src/main/resources/META-INF/services/org.neo4j.driver.internal.spi.Connector b/driver/src/main/resources/META-INF/services/org.neo4j.driver.internal.spi.Connector deleted file mode 100644 index 978a235abd..0000000000 --- a/driver/src/main/resources/META-INF/services/org.neo4j.driver.internal.spi.Connector +++ /dev/null @@ -1 +0,0 @@ -org.neo4j.driver.internal.connector.socket.SocketConnector \ No newline at end of file diff --git a/driver/src/main/resources/META-INF/services/org.neo4j.driver.v1.internal.spi.Connector b/driver/src/main/resources/META-INF/services/org.neo4j.driver.v1.internal.spi.Connector new file mode 100644 index 0000000000..69775e0455 --- /dev/null +++ b/driver/src/main/resources/META-INF/services/org.neo4j.driver.v1.internal.spi.Connector @@ -0,0 +1 @@ +org.neo4j.driver.v1.internal.connector.socket.SocketConnector \ No newline at end of file diff --git a/driver/src/test/java/org/neo4j/driver/DriverDocIT.java b/driver/src/test/java/org/neo4j/driver/v1/DriverDocIT.java similarity index 95% rename from driver/src/test/java/org/neo4j/driver/DriverDocIT.java rename to driver/src/test/java/org/neo4j/driver/v1/DriverDocIT.java index c819b979ef..8d92acdd10 100644 --- a/driver/src/test/java/org/neo4j/driver/DriverDocIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/DriverDocIT.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import javadoctest.DocSnippet; import javadoctest.DocTestRunner; @@ -26,7 +26,7 @@ import java.util.LinkedList; import java.util.List; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static java.util.Arrays.asList; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/driver/src/test/java/org/neo4j/driver/ParametersTest.java b/driver/src/test/java/org/neo4j/driver/v1/ParametersTest.java similarity index 93% rename from driver/src/test/java/org/neo4j/driver/ParametersTest.java rename to driver/src/test/java/org/neo4j/driver/v1/ParametersTest.java index abd2593568..4a319d6768 100644 --- a/driver/src/test/java/org/neo4j/driver/ParametersTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/ParametersTest.java @@ -16,13 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.ClientException; public class ParametersTest { @@ -40,4 +40,4 @@ public void shouldGiveHelpfulMessageOnMisalignedInput() throws Throwable // When Values.parameters( "1", new Object(), "2" ); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/ResultDocIT.java b/driver/src/test/java/org/neo4j/driver/v1/ResultDocIT.java similarity index 94% rename from driver/src/test/java/org/neo4j/driver/ResultDocIT.java rename to driver/src/test/java/org/neo4j/driver/v1/ResultDocIT.java index ef1c54821d..b1790bd062 100644 --- a/driver/src/test/java/org/neo4j/driver/ResultDocIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/ResultDocIT.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import javadoctest.DocSnippet; import javadoctest.DocTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static org.junit.Assert.assertTrue; diff --git a/driver/src/test/java/org/neo4j/driver/StatementRunnerDocIT.java b/driver/src/test/java/org/neo4j/driver/v1/StatementRunnerDocIT.java similarity index 95% rename from driver/src/test/java/org/neo4j/driver/StatementRunnerDocIT.java rename to driver/src/test/java/org/neo4j/driver/v1/StatementRunnerDocIT.java index 2db80a0c64..162803d8a9 100644 --- a/driver/src/test/java/org/neo4j/driver/StatementRunnerDocIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/StatementRunnerDocIT.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import javadoctest.DocSnippet; import javadoctest.DocTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/driver/src/test/java/org/neo4j/driver/StatementTest.java b/driver/src/test/java/org/neo4j/driver/v1/StatementTest.java similarity index 95% rename from driver/src/test/java/org/neo4j/driver/StatementTest.java rename to driver/src/test/java/org/neo4j/driver/v1/StatementTest.java index 15fcca8f75..6ce0e90112 100644 --- a/driver/src/test/java/org/neo4j/driver/StatementTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/StatementTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import java.util.Map; @@ -25,8 +25,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; -import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.internal.ParameterSupport.NO_PARAMETERS; +import static org.neo4j.driver.v1.Values.parameters; +import static org.neo4j.driver.v1.internal.ParameterSupport.NO_PARAMETERS; public class StatementTest { diff --git a/driver/src/test/java/org/neo4j/driver/TransactionDocIT.java b/driver/src/test/java/org/neo4j/driver/v1/TransactionDocIT.java similarity index 95% rename from driver/src/test/java/org/neo4j/driver/TransactionDocIT.java rename to driver/src/test/java/org/neo4j/driver/v1/TransactionDocIT.java index e8da703478..984ff448bb 100644 --- a/driver/src/test/java/org/neo4j/driver/TransactionDocIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/TransactionDocIT.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import javadoctest.DocSnippet; import javadoctest.DocTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static org.junit.Assert.assertEquals; diff --git a/driver/src/test/java/org/neo4j/driver/ValueDocIT.java b/driver/src/test/java/org/neo4j/driver/v1/ValueDocIT.java similarity index 95% rename from driver/src/test/java/org/neo4j/driver/ValueDocIT.java rename to driver/src/test/java/org/neo4j/driver/v1/ValueDocIT.java index 5e36553feb..d588d9a7be 100644 --- a/driver/src/test/java/org/neo4j/driver/ValueDocIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/ValueDocIT.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver; +package org.neo4j.driver.v1; import javadoctest.DocSnippet; import javadoctest.DocTestRunner; @@ -28,7 +28,7 @@ import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.neo4j.driver.Values.parameters; +import static org.neo4j.driver.v1.Values.parameters; @RunWith( DocTestRunner.class ) public class ValueDocIT diff --git a/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/ConnectionPoolIT.java similarity index 90% rename from driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/ConnectionPoolIT.java index 8f1a585c7a..13fca658e6 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/ConnectionPoolIT.java @@ -16,33 +16,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -<<<<<<< Updated upstream:driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java -import org.neo4j.driver.Driver; -import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Session; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.exceptions.DatabaseException; -import org.neo4j.driver.util.TestNeo4j; -======= import java.util.LinkedList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.junit.After; +import org.junit.Rule; +import org.junit.Test; + import org.neo4j.driver.v1.Driver; import org.neo4j.driver.v1.GraphDatabase; import org.neo4j.driver.v1.Session; import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.v1.exceptions.DatabaseException; import org.neo4j.driver.v1.util.TestNeo4j; ->>>>>>> Stashed changes:driver/src/test/java/org/neo4j/driver/v1/integration/ConnectionPoolIT.java import static junit.framework.TestCase.fail; diff --git a/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/EntityTypeIT.java similarity index 92% rename from driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/EntityTypeIT.java index 8b0ad5bdfc..0363a22d46 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/EntityTypeIT.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; -import org.neo4j.driver.Node; -import org.neo4j.driver.Path; -import org.neo4j.driver.Relationship; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.Node; +import org.neo4j.driver.v1.Path; +import org.neo4j.driver.v1.Relationship; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static org.junit.Assert.assertTrue; diff --git a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/ErrorIT.java similarity index 93% rename from driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/ErrorIT.java index 7777c8191e..45af2e18c0 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/ErrorIT.java @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.driver.Driver; -import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.GraphDatabase; +import org.neo4j.driver.v1.Transaction; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/LoadCSVIT.java similarity index 97% rename from driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/LoadCSVIT.java index 167f57df6c..3d046dc59d 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/LoadCSVIT.java @@ -16,24 +16,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; import java.io.IOException; -import org.neo4j.driver.Driver; -import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Result; -import org.neo4j.driver.Session; -import org.neo4j.driver.util.TestNeo4j; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.GraphDatabase; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.util.TestNeo4j; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.neo4j.driver.Values.parameters; +import static org.neo4j.driver.v1.Values.parameters; public class LoadCSVIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/LoggingIT.java similarity index 83% rename from driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/LoggingIT.java index 9904a7f20d..fe2172ad33 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/LoggingIT.java @@ -16,21 +16,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; import java.net.URI; -import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Config; -import org.neo4j.driver.Driver; -import org.neo4j.driver.Session; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.internal.spi.Logging; -import org.neo4j.driver.util.Neo4jRunner; -import org.neo4j.driver.util.TestNeo4j; +import org.neo4j.driver.v1.GraphDatabase; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.internal.spi.Logger; +import org.neo4j.driver.v1.internal.spi.Logging; +import org.neo4j.driver.v1.util.Neo4jRunner; +import org.neo4j.driver.v1.util.TestNeo4j; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; diff --git a/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/ParametersIT.java similarity index 97% rename from driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/ParametersIT.java index 48daff89ac..a51aa761cd 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/ParametersIT.java @@ -16,21 +16,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.driver.Record; -import org.neo4j.driver.Result; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.Record; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.neo4j.driver.Values.parameters; +import static org.neo4j.driver.v1.Values.parameters; public class ParametersIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/ResultStreamIT.java similarity index 92% rename from driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/ResultStreamIT.java index 3ba100ca5b..dfd61461c7 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/ResultStreamIT.java @@ -16,20 +16,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; -import org.neo4j.driver.Result; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.neo4j.driver.Values.parameters; +import static org.neo4j.driver.v1.Values.parameters; public class ResultStreamIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/SSLSocketChannelIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/SSLSocketChannelIT.java similarity index 84% rename from driver/src/test/java/org/neo4j/driver/integration/SSLSocketChannelIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/SSLSocketChannelIT.java index 55af1ac6af..b0999951bc 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SSLSocketChannelIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/SSLSocketChannelIT.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -34,16 +34,18 @@ import org.junit.Rule; import org.junit.Test; -import org.neo4j.driver.Config; -import org.neo4j.driver.Driver; -import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Result; -import org.neo4j.driver.internal.connector.socket.SSLSocketChannel; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.util.Neo4jResetMode; -import org.neo4j.driver.util.Neo4jRunner; -import org.neo4j.driver.util.Neo4jSettings; -import org.neo4j.driver.util.TestNeo4j; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.GraphDatabase; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.internal.connector.socket.SSLSocketChannel; +import org.neo4j.driver.v1.internal.spi.Logger; +import org.neo4j.driver.v1.util.Neo4jRunner; +import org.neo4j.driver.v1.util.Neo4jSettings; +import org.neo4j.driver.v1.util.TestNeo4j; +import org.neo4j.driver.v1.internal.ConfigTest; +import org.neo4j.driver.v1.internal.util.CertificateTool; +import org.neo4j.driver.v1.util.CertificateToolTest; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; @@ -54,11 +56,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.neo4j.driver.Config.TlsAuthenticationConfig.usingKnownCerts; -import static org.neo4j.driver.Config.TlsAuthenticationConfig.usingTrustedCert; -import static org.neo4j.driver.internal.ConfigTest.deleteDefaultKnownCertFileIfExists; -import static org.neo4j.driver.internal.util.CertificateTool.saveX509Cert; -import static org.neo4j.driver.util.CertificateToolTest.generateSelfSignedCertificate; +import static org.neo4j.driver.v1.internal.util.CertificateTool.saveX509Cert; public class SSLSocketChannelIT { @@ -83,7 +81,7 @@ private void performTLSHandshakeUsingKnownCerts( File knownCerts ) throws Throwa // When SSLSocketChannel sslChannel = - new SSLSocketChannel( "localhost", 7687, channel, logger, usingKnownCerts( knownCerts ) ); + new SSLSocketChannel( "localhost", 7687, channel, logger, Config.TlsAuthenticationConfig.usingKnownCerts( knownCerts ) ); sslChannel.close(); // Then @@ -109,7 +107,7 @@ public void shouldFailTLSHandshakeDueToWrongCertInKnownCertsFile() throws Throwa try { sslChannel = new SSLSocketChannel( "localhost", 7687, channel, mock( Logger.class ), - usingKnownCerts( knownCerts ) ); + Config.TlsAuthenticationConfig.usingKnownCerts( knownCerts ) ); sslChannel.close(); } catch ( SSLHandshakeException e ) @@ -134,7 +132,7 @@ private void createFakeServerCertPairInKnownCerts( String host, int port, File k String ip = InetAddress.getByName( host ).getHostAddress(); // localhost -> 127.0.0.1 String serverId = ip + ":" + port; - X509Certificate cert = generateSelfSignedCertificate(); + X509Certificate cert = CertificateToolTest.generateSelfSignedCertificate(); String certStr = DatatypeConverter.printBase64Binary( cert.getEncoded() ); BufferedWriter writer = new BufferedWriter( new FileWriter( knownCerts, true ) ); @@ -151,15 +149,15 @@ public void shouldFailTLSHandshakeDueToServerCertNotSignedByKnownCA() throws Thr channel.connect( new InetSocketAddress( "localhost", 7687 ) ); File trustedCertFile = File.createTempFile( "neo4j_trusted_cert", ".tmp" ); trustedCertFile.deleteOnExit(); - X509Certificate aRandomCert = generateSelfSignedCertificate(); - saveX509Cert( aRandomCert, trustedCertFile ); + X509Certificate aRandomCert = CertificateToolTest.generateSelfSignedCertificate(); + CertificateTool.saveX509Cert( aRandomCert, trustedCertFile ); // When & Then SSLSocketChannel sslChannel = null; try { sslChannel = new SSLSocketChannel( "localhost", 7687, channel, mock( Logger.class ), - usingTrustedCert( trustedCertFile ) ); + Config.TlsAuthenticationConfig.usingTrustedCert( trustedCertFile ) ); sslChannel.close(); } catch ( SSLHandshakeException e ) @@ -189,7 +187,7 @@ public void shouldPerformTLSHandshakeWithTrustedServerCert() throws Throwable File trustedCert = File.createTempFile( "neo4j_trusted_cert", ".tmp" ); trustedCert.deleteOnExit(); - saveX509Cert( certStr, trustedCert ); + CertificateTool.saveX509Cert( certStr, trustedCert ); Logger logger = mock( Logger.class ); SocketChannel channel = SocketChannel.open(); @@ -197,7 +195,7 @@ public void shouldPerformTLSHandshakeWithTrustedServerCert() throws Throwable // When SSLSocketChannel sslChannel = new SSLSocketChannel( "localhost", 7687, channel, logger, - usingTrustedCert( trustedCert ) ); + Config.TlsAuthenticationConfig.usingTrustedCert( trustedCert ) ); sslChannel.close(); // Then @@ -225,7 +223,7 @@ private String getServerCert( File knownCerts ) throws Throwable @Test public void shouldEstablishTLSConnection() throws Throwable { - deleteDefaultKnownCertFileIfExists(); + ConfigTest.deleteDefaultKnownCertFileIfExists(); Config config = Config.build().withTlsEnabled( true ).toConfig(); Driver driver = GraphDatabase.driver( diff --git a/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/ScalarTypeIT.java similarity index 70% rename from driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/ScalarTypeIT.java index 4d125fc1ff..903eb7d383 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/ScalarTypeIT.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; @@ -27,15 +27,16 @@ import java.util.Collection; import java.util.Collections; -import org.neo4j.driver.Value; -import org.neo4j.driver.internal.value.ListValue; -import org.neo4j.driver.internal.value.MapValue; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.internal.value.ListValue; +import org.neo4j.driver.v1.internal.value.MapValue; +import org.neo4j.driver.v1.util.TestNeo4jSession; +import org.neo4j.driver.v1.Values; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.Values.value; + +import static org.neo4j.driver.v1.Values.value; @RunWith(Parameterized.class) public class ScalarTypeIT @@ -53,15 +54,15 @@ public class ScalarTypeIT public static Collection typesToTest() { return Arrays.asList( - new Object[]{"RETURN 1 as v", value( 1l )}, - new Object[]{"RETURN 1.1 as v", value( 1.1d )}, - new Object[]{"RETURN 'hello' as v", value( "hello" )}, - new Object[]{"RETURN true as v", value( true )}, - new Object[]{"RETURN false as v", value( false )}, - new Object[]{"RETURN [1,2,3] as v", new ListValue( value( 1 ), value( 2 ), value( 3 ) )}, - new Object[]{"RETURN ['hello'] as v", new ListValue( value( "hello" ) )}, + new Object[]{"RETURN 1 as v", Values.value( 1l )}, + new Object[]{"RETURN 1.1 as v", Values.value( 1.1d )}, + new Object[]{"RETURN 'hello' as v", Values.value( "hello" )}, + new Object[]{"RETURN true as v", Values.value( true )}, + new Object[]{"RETURN false as v", Values.value( false )}, + new Object[]{"RETURN [1,2,3] as v", new ListValue( Values.value( 1 ), Values.value( 2 ), Values.value( 3 ) )}, + new Object[]{"RETURN ['hello'] as v", new ListValue( Values.value( "hello" ) )}, new Object[]{"RETURN [] as v", new ListValue()}, - new Object[]{"RETURN {k:'hello'} as v", new MapValue( parameters( "k", value( "hello" ) ) )}, + new Object[]{"RETURN {k:'hello'} as v", new MapValue( Values.parameters( "k", Values.value( "hello" ) ) )}, new Object[]{"RETURN {} as v", new MapValue( Collections.emptyMap() )} ); } diff --git a/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/ServerKilledIT.java similarity index 90% rename from driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/ServerKilledIT.java index 26b718a754..d0a3bfafa5 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/ServerKilledIT.java @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; -import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Driver; -import org.neo4j.driver.Session; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.util.Neo4jRunner; -import org.neo4j.driver.util.TestNeo4j; +import org.neo4j.driver.v1.GraphDatabase; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.util.Neo4jRunner; +import org.neo4j.driver.v1.util.TestNeo4j; import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java similarity index 85% rename from driver/src/test/java/org/neo4j/driver/integration/SessionIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java index 629582a5f7..14f3f73e70 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; -import org.neo4j.driver.Driver; -import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Session; -import org.neo4j.driver.util.TestNeo4j; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.GraphDatabase; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.util.TestNeo4j; import static org.junit.Assert.assertFalse; diff --git a/driver/src/test/java/org/neo4j/driver/integration/StatementIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/StatementIT.java similarity index 91% rename from driver/src/test/java/org/neo4j/driver/integration/StatementIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/StatementIT.java index 06c4aa04ac..375fed7542 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/StatementIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/StatementIT.java @@ -16,22 +16,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; -import org.neo4j.driver.Record; -import org.neo4j.driver.Result; -import org.neo4j.driver.ReusableResult; -import org.neo4j.driver.Value; -import org.neo4j.driver.Values; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.Record; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.ReusableResult; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.Values; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.neo4j.driver.Values.parameters; +import static org.neo4j.driver.v1.Values.parameters; public class StatementIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/SummaryIT.java similarity index 88% rename from driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/SummaryIT.java index 788cee1b37..97808b017f 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/SummaryIT.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; @@ -24,14 +24,15 @@ import java.util.List; import java.util.Map; -import org.neo4j.driver.Notification; -import org.neo4j.driver.Plan; -import org.neo4j.driver.ProfiledPlan; -import org.neo4j.driver.Result; -import org.neo4j.driver.ResultSummary; -import org.neo4j.driver.Value; -import org.neo4j.driver.Values; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.Notification; +import org.neo4j.driver.v1.Plan; +import org.neo4j.driver.v1.ProfiledPlan; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.ResultSummary; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.Values; +import org.neo4j.driver.v1.util.TestNeo4jSession; +import org.neo4j.driver.v1.StatementType; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; @@ -41,10 +42,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.neo4j.driver.StatementType.READ_ONLY; -import static org.neo4j.driver.StatementType.READ_WRITE; -import static org.neo4j.driver.StatementType.SCHEMA_WRITE; -import static org.neo4j.driver.StatementType.WRITE_ONLY; public class SummaryIT { @@ -69,7 +66,7 @@ public void shouldContainBasicMetadata() throws Throwable // Then assertFalse( result.next() ); - assertThat( summary.statementType(), equalTo( READ_ONLY ) ); + assertThat( summary.statementType(), equalTo( StatementType.READ_ONLY ) ); assertThat( summary.statement().text(), equalTo( statementText ) ); assertThat( summary.statement().parameters(), equalTo( statementParameters ) ); assertFalse( summary.hasPlan() ); @@ -103,10 +100,10 @@ public void shouldContainCorrectStatistics() throws Throwable @Test public void shouldContainCorrectStatementType() throws Throwable { - assertThat( session.run("MATCH (n) RETURN 1").summarize().statementType(), equalTo( READ_ONLY )); - assertThat( session.run("CREATE (n)").summarize().statementType(), equalTo( WRITE_ONLY )); - assertThat( session.run("CREATE (n) RETURN (n)").summarize().statementType(), equalTo( READ_WRITE )); - assertThat( session.run("CREATE INDEX ON :User(p)").summarize().statementType(), equalTo( SCHEMA_WRITE )); + assertThat( session.run("MATCH (n) RETURN 1").summarize().statementType(), equalTo( StatementType.READ_ONLY )); + assertThat( session.run("CREATE (n)").summarize().statementType(), equalTo( StatementType.WRITE_ONLY )); + assertThat( session.run("CREATE (n) RETURN (n)").summarize().statementType(), equalTo( StatementType.READ_WRITE )); + assertThat( session.run("CREATE INDEX ON :User(p)").summarize().statementType(), equalTo( StatementType.SCHEMA_WRITE )); } @Test diff --git a/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java similarity index 94% rename from driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java rename to driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java index 4c45aeed6a..a4c903cce3 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java @@ -16,16 +16,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.integration; +package org.neo4j.driver.v1.integration; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.driver.Result; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Transaction; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.util.TestNeo4jSession; import static junit.framework.Assert.assertTrue; import static junit.framework.TestCase.assertFalse; diff --git a/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/ConfigTest.java similarity index 76% rename from driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/ConfigTest.java index 4890a8d5c5..f66d16ed15 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/ConfigTest.java @@ -16,20 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import org.junit.Test; import java.io.File; -import org.neo4j.driver.Config; -import org.neo4j.driver.Config.TlsAuthenticationConfig; +import org.neo4j.driver.v1.Config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.neo4j.driver.Config.TlsAuthenticationConfig.usingKnownCerts; -import static org.neo4j.driver.Config.TlsAuthenticationConfig.usingTrustedCert; public class ConfigTest { @@ -42,7 +39,7 @@ public void shouldDefaultToKnownCerts() Config config = Config.defaultConfig(); // When - TlsAuthenticationConfig authConfig = config.tlsAuthConfig(); + Config.TlsAuthenticationConfig authConfig = config.tlsAuthConfig(); // Then assertFalse( authConfig.isFullAuthEnabled() ); @@ -54,10 +51,10 @@ public void shouldChangeToNewKnownCerts() { // Given File knownCerts = new File( "new_known_certs" ); - Config config = Config.build().withTlsAuthConfig( usingKnownCerts( knownCerts ) ).toConfig(); + Config config = Config.build().withTlsAuthConfig( Config.TlsAuthenticationConfig.usingKnownCerts( knownCerts ) ).toConfig(); // When - TlsAuthenticationConfig authConfig = config.tlsAuthConfig(); + Config.TlsAuthenticationConfig authConfig = config.tlsAuthConfig(); // Then assertFalse( authConfig.isFullAuthEnabled() ); @@ -69,10 +66,10 @@ public void shouldChangeToTrustedCert() { // Given File trustedCert = new File( "trusted_cert" ); - Config config = Config.build().withTlsAuthConfig( usingTrustedCert( trustedCert ) ).toConfig(); + Config config = Config.build().withTlsAuthConfig( Config.TlsAuthenticationConfig.usingTrustedCert( trustedCert ) ).toConfig(); // When - TlsAuthenticationConfig authConfig = config.tlsAuthConfig(); + Config.TlsAuthenticationConfig authConfig = config.tlsAuthConfig(); // Then assertTrue( authConfig.isFullAuthEnabled() ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/SelfContainedNodeTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/SelfContainedNodeTest.java similarity index 90% rename from driver/src/test/java/org/neo4j/driver/internal/SelfContainedNodeTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/SelfContainedNodeTest.java index 163510dda7..cc1e007b8b 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SelfContainedNodeTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/SelfContainedNodeTest.java @@ -16,20 +16,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import org.junit.Test; import java.util.List; -import org.neo4j.driver.Node; -import org.neo4j.driver.internal.util.Iterables; -import org.neo4j.driver.Values; +import org.neo4j.driver.v1.Node; +import org.neo4j.driver.v1.internal.util.Iterables; +import org.neo4j.driver.v1.Values; import static java.util.Arrays.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; -import static org.neo4j.driver.Values.parameters; +import static org.neo4j.driver.v1.Values.parameters; public class SelfContainedNodeTest { @@ -83,4 +83,4 @@ public void testValue() // Then assertThat( node.property( "name" ).javaString(), equalTo( "Adam" ) ); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/SimpleIdentityTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/SimpleIdentityTest.java similarity index 95% rename from driver/src/test/java/org/neo4j/driver/internal/SimpleIdentityTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/SimpleIdentityTest.java index 0dc88c91a8..022d19027e 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SimpleIdentityTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/SimpleIdentityTest.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import org.junit.Test; -import org.neo4j.driver.Identity; +import org.neo4j.driver.v1.Identity; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; @@ -63,4 +63,4 @@ public void shouldBeAbleToCastIdentityToString() throws Throwable } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/SimplePathTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/SimplePathTest.java similarity index 89% rename from driver/src/test/java/org/neo4j/driver/internal/SimplePathTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/SimplePathTest.java index 4b9c8ca3d8..41f3ca876d 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SimplePathTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/SimplePathTest.java @@ -16,8 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; +import org.hamcrest.MatcherAssert; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -25,10 +26,10 @@ import java.util.Arrays; import java.util.List; -import org.neo4j.driver.Node; -import org.neo4j.driver.Path; -import org.neo4j.driver.Relationship; -import org.neo4j.driver.util.Lists; +import org.neo4j.driver.v1.Node; +import org.neo4j.driver.v1.Path; +import org.neo4j.driver.v1.Relationship; +import org.neo4j.driver.v1.util.Lists; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -82,12 +83,12 @@ public void shouldBeAbleToIterateOverPathAsSegments() throws Exception List segments = Lists.asList( path ); // Then - assertThat( segments, equalTo( Arrays.asList( (Path.Segment) - new SimplePath.SelfContainedSegment( - new SimpleNode( 1 ), - new SimpleRelationship( -1, 1, 2, "KNOWS" ), - new SimpleNode( 2 ) - ), + MatcherAssert.assertThat( segments, equalTo( Arrays.asList( (Path.Segment) + new SimplePath.SelfContainedSegment( + new SimpleNode( 1 ), + new SimpleRelationship( -1, 1, 2, "KNOWS" ), + new SimpleNode( 2 ) + ), new SimplePath.SelfContainedSegment( new SimpleNode( 2 ), new SimpleRelationship( -2, 3, 2, "KNOWS" ), @@ -200,4 +201,4 @@ public void shouldNotBeAbleToCreatePathWithRelationshipThatDoesNotConnect() } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/StandardSessionTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/StandardSessionTest.java similarity index 92% rename from driver/src/test/java/org/neo4j/driver/internal/StandardSessionTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/StandardSessionTest.java index 718c7399e8..f787dcc16d 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/StandardSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/StandardSessionTest.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.spi.Connection; +import org.neo4j.driver.v1.Transaction; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.spi.Connection; import static junit.framework.TestCase.assertNotNull; import static org.mockito.Mockito.mock; @@ -78,4 +78,4 @@ public void shouldBeAbleToOpenTxAfterPreviousIsClosed() throws Throwable // Then we should've gotten a transaction object back assertNotNull( tx ); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/StandardTransactionTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/StandardTransactionTest.java similarity index 97% rename from driver/src/test/java/org/neo4j/driver/internal/StandardTransactionTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/StandardTransactionTest.java index 753b05f10a..1c4a63cdde 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/StandardTransactionTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/StandardTransactionTest.java @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import org.junit.Test; import org.mockito.InOrder; -import org.neo4j.driver.internal.spi.Connection; +import org.neo4j.driver.v1.internal.spi.Connection; import static java.util.Collections.EMPTY_MAP; import static org.mockito.Mockito.inOrder; diff --git a/driver/src/test/java/org/neo4j/driver/internal/SummaryBuilderTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/SummaryBuilderTest.java similarity index 88% rename from driver/src/test/java/org/neo4j/driver/internal/SummaryBuilderTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/SummaryBuilderTest.java index b320d70910..452961a6bb 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SummaryBuilderTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/SummaryBuilderTest.java @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import org.junit.Test; -import org.neo4j.driver.ResultSummary; -import org.neo4j.driver.Statement; -import org.neo4j.driver.UpdateStatistics; -import org.neo4j.driver.internal.summary.SimpleUpdateStatistics; -import org.neo4j.driver.internal.summary.SummaryBuilder; +import org.neo4j.driver.v1.ResultSummary; +import org.neo4j.driver.v1.Statement; +import org.neo4j.driver.v1.UpdateStatistics; +import org.neo4j.driver.v1.internal.summary.SimpleUpdateStatistics; +import org.neo4j.driver.v1.internal.summary.SummaryBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/ValuesTest.java similarity index 90% rename from driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/ValuesTest.java index b2f7cc0b4f..5846b12469 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/ValuesTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal; +package org.neo4j.driver.v1.internal; import org.junit.Rule; import org.junit.Test; @@ -26,21 +26,21 @@ import java.util.List; import java.util.Map; -import org.neo4j.driver.Value; -import org.neo4j.driver.Values; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.value.ListValue; -import org.neo4j.driver.internal.value.MapValue; -import org.neo4j.driver.internal.value.StringValue; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.Values; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.value.ListValue; +import org.neo4j.driver.v1.internal.value.MapValue; +import org.neo4j.driver.v1.internal.value.StringValue; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import static org.neo4j.driver.Values.value; -import static org.neo4j.driver.Values.valueToList; -import static org.neo4j.driver.Values.valueToString; -import static org.neo4j.driver.Values.values; +import static org.neo4j.driver.v1.Values.value; +import static org.neo4j.driver.v1.Values.valueToList; +import static org.neo4j.driver.v1.Values.valueToString; +import static org.neo4j.driver.v1.Values.values; public class ValuesTest { diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/ChunkedInputTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedInputTest.java similarity index 96% rename from driver/src/test/java/org/neo4j/driver/internal/connector/socket/ChunkedInputTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedInputTest.java index ed98e22223..27fafa99f4 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/ChunkedInputTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedInputTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import org.junit.Rule; import org.junit.Test; @@ -31,8 +31,8 @@ import java.nio.channels.ReadableByteChannel; import java.util.Arrays; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.util.RecordingByteChannel; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.util.RecordingByteChannel; import static junit.framework.Assert.fail; import static junit.framework.TestCase.assertEquals; @@ -183,7 +183,7 @@ public void shouldNotReadMessageEndingWhenByteLeftInBuffer() } catch ( ClientException e ) { - assertEquals( "org.neo4j.driver.exceptions.ClientException: Trying to read message complete ending " + + assertEquals( "org.neo4j.driver.v1.exceptions.ClientException: Trying to read message complete ending " + "'00 00' while there are more data left in the message content unread: buffer [], " + "unread chunk size 1", e.toString() ); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/ChunkedOutputTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedOutputTest.java similarity index 91% rename from driver/src/test/java/org/neo4j/driver/internal/connector/socket/ChunkedOutputTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedOutputTest.java index 773b6c6381..0765ef9dd3 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/ChunkedOutputTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/ChunkedOutputTest.java @@ -16,12 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; +import org.hamcrest.MatcherAssert; import org.junit.Test; -import org.neo4j.driver.internal.util.BytePrinter; -import org.neo4j.driver.util.RecordingByteChannel; +import org.neo4j.driver.v1.internal.util.BytePrinter; +import org.neo4j.driver.v1.util.RecordingByteChannel; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -40,7 +41,7 @@ public void shouldChunkSingleMessage() throws Throwable out.flush(); // Then - assertThat( BytePrinter.hex( channel.getBytes() ), + MatcherAssert.assertThat( BytePrinter.hex( channel.getBytes() ), equalTo( "00 03 01 00 02 00 00 " ) ); } diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/LoggingResponseHandlerTest.java similarity index 82% rename from driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/LoggingResponseHandlerTest.java index 04d9105496..d73def1db8 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/LoggingResponseHandlerTest.java @@ -16,28 +16,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import org.junit.Test; import java.util.HashMap; -import org.neo4j.driver.Value; -import org.neo4j.driver.internal.logging.DevNullLogger; -import org.neo4j.driver.internal.messaging.AckFailureMessage; -import org.neo4j.driver.internal.messaging.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.FailureMessage; -import org.neo4j.driver.internal.messaging.IgnoredMessage; -import org.neo4j.driver.internal.messaging.InitMessage; -import org.neo4j.driver.internal.messaging.Message; -import org.neo4j.driver.internal.messaging.MessageHandler; -import org.neo4j.driver.internal.messaging.PullAllMessage; -import org.neo4j.driver.internal.messaging.RecordMessage; -import org.neo4j.driver.internal.messaging.RunMessage; -import org.neo4j.driver.internal.messaging.SuccessMessage; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.internal.logging.DevNullLogger; +import org.neo4j.driver.v1.internal.messaging.AckFailureMessage; +import org.neo4j.driver.v1.internal.messaging.DiscardAllMessage; +import org.neo4j.driver.v1.internal.messaging.FailureMessage; +import org.neo4j.driver.v1.internal.messaging.IgnoredMessage; +import org.neo4j.driver.v1.internal.messaging.InitMessage; +import org.neo4j.driver.v1.internal.messaging.Message; +import org.neo4j.driver.v1.internal.messaging.MessageHandler; +import org.neo4j.driver.v1.internal.messaging.PullAllMessage; +import org.neo4j.driver.v1.internal.messaging.RecordMessage; +import org.neo4j.driver.v1.internal.messaging.RunMessage; +import org.neo4j.driver.v1.internal.messaging.SuccessMessage; import static junit.framework.Assert.assertEquals; -import static org.neo4j.driver.Values.parameters; +import static org.neo4j.driver.v1.Values.parameters; public class LoggingResponseHandlerTest { diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannelTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/SSLSocketChannelTest.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannelTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/SSLSocketChannelTest.java index 9d7476181d..307d6b3cd1 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannelTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/SSLSocketChannelTest.java @@ -16,8 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; +import junit.framework.TestCase; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; @@ -29,8 +30,8 @@ import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLSession; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.internal.util.BytePrinter; +import org.neo4j.driver.v1.internal.spi.Logger; +import org.neo4j.driver.v1.internal.util.BytePrinter; import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING; import static javax.net.ssl.SSLEngineResult.Status.BUFFER_OVERFLOW; @@ -142,7 +143,7 @@ public SSLEngineResult answer( InvocationOnMock invocation ) throws Throwable // Should enlarge plainIn buffer to hold all deciphered bytes assertEquals( 8, plainIn.capacity() ); buffer.flip(); - assertEquals( "00 01 ", BytePrinter.hex( buffer ) ); + TestCase.assertEquals( "00 01 ", BytePrinter.hex( buffer ) ); // When trying to read 4 existing bytes and then 6 more bytes buffer = ByteBuffer.allocate( 10 ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketClientTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/SocketClientTest.java similarity index 89% rename from driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketClientTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/SocketClientTest.java index 76c1f2fdef..90a877dfdb 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketClientTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/SocketClientTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import org.junit.Ignore; import org.junit.Rule; @@ -25,9 +25,9 @@ import java.net.ServerSocket; -import org.neo4j.driver.Config; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.logging.DevNullLogger; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.logging.DevNullLogger; public class SocketClientTest { @@ -55,4 +55,4 @@ public void testNetworkTimeout() throws Throwable // When client.start(); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/SocketResponseHandlerTest.java similarity index 89% rename from driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandlerTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/SocketResponseHandlerTest.java index 25f2c73158..58a2cfca42 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/SocketResponseHandlerTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import org.junit.Before; import org.junit.Test; @@ -24,12 +24,12 @@ import java.util.Collections; import java.util.Map; -import org.neo4j.driver.Plan; -import org.neo4j.driver.StatementType; -import org.neo4j.driver.UpdateStatistics; -import org.neo4j.driver.Value; -import org.neo4j.driver.internal.spi.StreamCollector; -import org.neo4j.driver.internal.summary.SimpleUpdateStatistics; +import org.neo4j.driver.v1.Plan; +import org.neo4j.driver.v1.StatementType; +import org.neo4j.driver.v1.UpdateStatistics; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.internal.spi.StreamCollector; +import org.neo4j.driver.v1.internal.summary.SimpleUpdateStatistics; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; @@ -37,10 +37,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; -import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.Values.value; -import static org.neo4j.driver.Values.values; -import static org.neo4j.driver.internal.summary.SimplePlan.plan; +import static org.neo4j.driver.v1.Values.parameters; +import static org.neo4j.driver.v1.Values.value; +import static org.neo4j.driver.v1.Values.values; +import static org.neo4j.driver.v1.internal.summary.SimplePlan.plan; public class SocketResponseHandlerTest { diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/TrustOnFirstUseTrustManagerTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/TrustOnFirstUseTrustManagerTest.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/internal/connector/socket/TrustOnFirstUseTrustManagerTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/TrustOnFirstUseTrustManagerTest.java index e8d22e164b..934af26e51 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/TrustOnFirstUseTrustManagerTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/connector/socket/TrustOnFirstUseTrustManagerTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.connector.socket; +package org.neo4j.driver.v1.internal.connector.socket; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/driver/src/test/java/org/neo4j/driver/internal/logging/ConsoleLoggingTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/logging/ConsoleLoggingTest.java similarity index 94% rename from driver/src/test/java/org/neo4j/driver/internal/logging/ConsoleLoggingTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/logging/ConsoleLoggingTest.java index 5cce8ae097..c01b27aed0 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/logging/ConsoleLoggingTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/logging/ConsoleLoggingTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.logging; +package org.neo4j.driver.v1.internal.logging; import org.junit.AfterClass; import org.junit.Before; @@ -29,8 +29,8 @@ import java.util.Scanner; import java.util.logging.Level; -import org.neo4j.driver.internal.logging.ConsoleLogging.ConsoleLogger; -import org.neo4j.driver.internal.spi.Logger; +import org.neo4j.driver.v1.internal.logging.ConsoleLogging.ConsoleLogger; +import org.neo4j.driver.v1.internal.spi.Logger; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/messaging/MessageFormatTest.java similarity index 91% rename from driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/messaging/MessageFormatTest.java index cfda5643ca..b52b88c7d9 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/messaging/MessageFormatTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.messaging; +package org.neo4j.driver.v1.internal.messaging; import org.junit.Rule; import org.junit.Test; @@ -30,21 +30,21 @@ import java.util.ArrayList; import java.util.HashMap; -import org.neo4j.driver.Value; -import org.neo4j.driver.internal.SimpleNode; -import org.neo4j.driver.internal.SimplePath; -import org.neo4j.driver.internal.SimpleRelationship; -import org.neo4j.driver.internal.connector.socket.ChunkedOutput; -import org.neo4j.driver.internal.packstream.PackStream; -import org.neo4j.driver.internal.util.BytePrinter; -import org.neo4j.driver.util.DumpMessage; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.internal.SimpleNode; +import org.neo4j.driver.v1.internal.SimplePath; +import org.neo4j.driver.v1.internal.SimpleRelationship; +import org.neo4j.driver.v1.internal.connector.socket.ChunkedOutput; +import org.neo4j.driver.v1.internal.packstream.PackStream; +import org.neo4j.driver.v1.internal.util.BytePrinter; +import org.neo4j.driver.v1.util.DumpMessage; import static java.util.Arrays.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.startsWith; -import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.Values.value; +import static org.neo4j.driver.v1.Values.parameters; +import static org.neo4j.driver.v1.Values.value; public class MessageFormatTest { diff --git a/driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/packstream/PackStreamTest.java similarity index 99% rename from driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/packstream/PackStreamTest.java index b010f95e72..efbe52f1f9 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/packstream/PackStreamTest.java @@ -16,8 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.packstream; +package org.neo4j.driver.v1.internal.packstream; +import org.hamcrest.MatcherAssert; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -29,7 +30,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.neo4j.driver.internal.util.BytePrinter; +import org.neo4j.driver.v1.internal.util.BytePrinter; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Arrays.asList; @@ -461,7 +462,7 @@ public void testCanPackAndUnpackSpecialStringFromBytes() throws Throwable PackStream.Packer packer = machine.packer(); byte[] bytes = code.getBytes( UTF_8 ); - assertThat( BytePrinter.hex( bytes ).trim(), equalTo( "4d 6a c3 b6 6c 6e 69 72" ) ); + MatcherAssert.assertThat( BytePrinter.hex( bytes ).trim(), equalTo( "4d 6a c3 b6 6c 6e 69 72" ) ); assertThat( new String( bytes, UTF_8 ), equalTo( code ) ); packer.packString( bytes ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/pool/ConnectionInvalidationTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/pool/ConnectionInvalidationTest.java similarity index 89% rename from driver/src/test/java/org/neo4j/driver/internal/pool/ConnectionInvalidationTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/pool/ConnectionInvalidationTest.java index d8aeb88647..e8c779741a 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/pool/ConnectionInvalidationTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/pool/ConnectionInvalidationTest.java @@ -16,16 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.pool; +package org.neo4j.driver.v1.internal.pool; import org.junit.Test; +import org.mockito.Mockito; import java.io.IOException; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.exceptions.Neo4jException; -import org.neo4j.driver.exceptions.TransientException; -import org.neo4j.driver.internal.spi.Connection; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.Neo4jException; +import org.neo4j.driver.v1.exceptions.TransientException; +import org.neo4j.driver.v1.internal.spi.Connection; import static junit.framework.TestCase.assertFalse; import static org.hamcrest.CoreMatchers.equalTo; @@ -34,7 +35,6 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; public class ConnectionInvalidationTest { @@ -45,7 +45,7 @@ public class ConnectionInvalidationTest public void shouldInvalidateConnectionThatIsOld() throws Throwable { // Given a connection that's broken - doThrow(new ClientException( "That didn't work" )).when( delegate ).sync(); + Mockito.doThrow( new ClientException( "That didn't work" ) ).when( delegate ).sync(); // When/Then assertTrue( new PooledConnectionValidator( 10 ).isValid( conn, 1 ) ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/pool/StandardConnectionPoolTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/pool/StandardConnectionPoolTest.java similarity index 90% rename from driver/src/test/java/org/neo4j/driver/internal/pool/StandardConnectionPoolTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/pool/StandardConnectionPoolTest.java index 8ed104a610..b5d5e984ef 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/pool/StandardConnectionPoolTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/pool/StandardConnectionPoolTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.pool; +package org.neo4j.driver.v1.internal.pool; import org.junit.Rule; import org.junit.Test; @@ -24,11 +24,11 @@ import java.net.URI; -import org.neo4j.driver.Config; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.spi.Connection; -import org.neo4j.driver.internal.spi.Connector; -import org.neo4j.driver.internal.util.Clock; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.spi.Connection; +import org.neo4j.driver.v1.internal.spi.Connector; +import org.neo4j.driver.v1.internal.util.Clock; import static java.util.Arrays.asList; import static org.mockito.Matchers.any; diff --git a/driver/src/test/java/org/neo4j/driver/internal/pool/ThreadCachingPoolTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/pool/ThreadCachingPoolTest.java similarity index 95% rename from driver/src/test/java/org/neo4j/driver/internal/pool/ThreadCachingPoolTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/pool/ThreadCachingPoolTest.java index 632f8bbe1d..f06f8a5c70 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/pool/ThreadCachingPoolTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/pool/ThreadCachingPoolTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.pool; +package org.neo4j.driver.v1.internal.pool; import org.junit.Before; import org.junit.Rule; @@ -30,14 +30,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.util.Consumer; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.util.Consumer; +import org.neo4j.driver.v1.internal.util.Clock; import static junit.framework.TestCase.fail; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertNull; -import static org.neo4j.driver.internal.util.Clock.SYSTEM; public class ThreadCachingPoolTest { @@ -67,7 +67,7 @@ public void shouldDisposeAllOnClose() throws Throwable { // Given ThreadCachingPool - pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, SYSTEM ); + pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, Clock.SYSTEM ); PooledObject o1 = pool.acquire( 10, TimeUnit.SECONDS ); PooledObject o2 = pool.acquire( 10, TimeUnit.SECONDS ); @@ -89,7 +89,7 @@ public void shouldDisposeValuesReleasedAfterClose() throws Throwable { // Given ThreadCachingPool - pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, SYSTEM ); + pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, Clock.SYSTEM ); PooledObject o1 = pool.acquire( 10, TimeUnit.SECONDS ); PooledObject o2 = pool.acquire( 10, TimeUnit.SECONDS ); @@ -111,7 +111,7 @@ public void shouldBlockUpToTimeoutIfNoneAvailable() throws Throwable { // Given ThreadCachingPool - pool = new ThreadCachingPool<>( 1, trackAllocator, checkInvalidateFlag, SYSTEM ); + pool = new ThreadCachingPool<>( 1, trackAllocator, checkInvalidateFlag, Clock.SYSTEM ); pool.acquire( 10, TimeUnit.SECONDS ); @@ -127,7 +127,7 @@ public void shouldDisposeOfInvalidItems() throws Throwable { // Given ThreadCachingPool - pool = new ThreadCachingPool<>( 4, trackAllocator, invalidIfIdIs(0), SYSTEM ); + pool = new ThreadCachingPool<>( 4, trackAllocator, invalidIfIdIs(0), Clock.SYSTEM ); // And given we've allocated/releasd object with id 0 once (no validation on first allocation) // TODO: Is that the right thing to do? I assume the allocator will allocate healthy objects.. @@ -147,7 +147,7 @@ public void shouldNotAllocateNewValuesAfterClose() throws Throwable { // Given a pool that's been closed ThreadCachingPool - pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, SYSTEM ); + pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, Clock.SYSTEM ); pool.close(); @@ -163,7 +163,7 @@ public void shouldDisposeOfObjectsThatBecomeInvalidWhileInUse() throws Throwable { // Given a pool that's been closed ThreadCachingPool - pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, SYSTEM ); + pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, Clock.SYSTEM ); PooledObject val = pool.acquire( 10, TimeUnit.SECONDS ); @@ -181,7 +181,7 @@ public void shouldRecoverFromItemCreationFailure() throws Throwable { // Given a pool where creation will fail from the get-go ThreadCachingPool - pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, SYSTEM ); + pool = new ThreadCachingPool<>( 4, trackAllocator, checkInvalidateFlag, Clock.SYSTEM ); trackAllocator.startEmulatingCreationFailures(); @@ -217,7 +217,7 @@ public void shouldRecovedDisposedItemReallocationFailing() throws Throwable { // Given a pool where creation will fail from the get-go ThreadCachingPool - pool = new ThreadCachingPool<>( 2, trackAllocator, checkInvalidateFlag, SYSTEM ); + pool = new ThreadCachingPool<>( 2, trackAllocator, checkInvalidateFlag, Clock.SYSTEM ); // And given I've allocated and released some stuff, and it became invalid, such that I have a set // of disposed-of slots in the pool @@ -396,4 +396,4 @@ public void stopEmulatingCreationFailures() this.creationException = null; } } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/summary/ResultBuilderTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/summary/ResultBuilderTest.java similarity index 88% rename from driver/src/test/java/org/neo4j/driver/internal/summary/ResultBuilderTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/summary/ResultBuilderTest.java index 6443f6d312..6e773c45e6 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/summary/ResultBuilderTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/summary/ResultBuilderTest.java @@ -16,21 +16,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.summary; +package org.neo4j.driver.v1.internal.summary; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.driver.Record; -import org.neo4j.driver.ReusableResult; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.ParameterSupport; +import org.neo4j.driver.v1.Record; +import org.neo4j.driver.v1.ReusableResult; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.ParameterSupport; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; -import static org.neo4j.driver.Values.value; +import static org.neo4j.driver.v1.Values.value; public class ResultBuilderTest { diff --git a/driver/src/test/java/org/neo4j/driver/internal/summary/SimplePlanTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/summary/SimplePlanTest.java similarity index 92% rename from driver/src/test/java/org/neo4j/driver/internal/summary/SimplePlanTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/summary/SimplePlanTest.java index 1a4660edf5..d1d010cccf 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/summary/SimplePlanTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/summary/SimplePlanTest.java @@ -16,21 +16,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.summary; +package org.neo4j.driver.v1.internal.summary; import org.junit.Test; import java.util.Collections; import java.util.List; -import org.neo4j.driver.Plan; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Plan; +import org.neo4j.driver.v1.Value; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; -import static org.neo4j.driver.Values.parameters; -import static org.neo4j.driver.Values.value; -import static org.neo4j.driver.Values.values; +import static org.neo4j.driver.v1.Values.parameters; +import static org.neo4j.driver.v1.Values.value; +import static org.neo4j.driver.v1.Values.values; @SuppressWarnings("unchecked") public class SimplePlanTest diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/BooleanValueTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/value/BooleanValueTest.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/internal/value/BooleanValueTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/value/BooleanValueTest.java index 2f6e7c87d5..f52fa12b9c 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/BooleanValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/value/BooleanValueTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import org.junit.Test; @@ -85,4 +85,4 @@ public void testHashCode() throws Exception // Then assertThat( value.hashCode(), notNullValue() ); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/value/FloatValueTest.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/value/FloatValueTest.java index 21c6ab8925..f38142f461 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/value/FloatValueTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import org.junit.Test; @@ -85,4 +85,4 @@ public void testHashCode() throws Exception // Then assertThat( value.hashCode(), notNullValue() ); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/IdentityValueTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/value/IdentityValueTest.java similarity index 85% rename from driver/src/test/java/org/neo4j/driver/internal/value/IdentityValueTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/value/IdentityValueTest.java index 1ec7ba19f5..e95e958044 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/IdentityValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/value/IdentityValueTest.java @@ -16,18 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import org.junit.Test; -import org.neo4j.driver.Identity; +import org.neo4j.driver.v1.Identity; +import org.neo4j.driver.v1.internal.Identities; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; -import static org.neo4j.driver.internal.Identities.identity; - public class IdentityValueTest { @@ -35,7 +34,7 @@ public class IdentityValueTest public void testValueAsIdentity() throws Exception { // Given - Identity id = identity( 1 ); + Identity id = Identities.identity( 1 ); IdentityValue value = new IdentityValue( id ); // Then @@ -46,7 +45,7 @@ public void testValueAsIdentity() throws Exception public void testIsIdentity() throws Exception { // Given - Identity id = identity( 1 ); + Identity id = Identities.identity( 1 ); IdentityValue value = new IdentityValue( id ); // Then @@ -57,7 +56,7 @@ public void testIsIdentity() throws Exception public void testEquals() throws Exception { // Given - Identity id = identity( 1 ); + Identity id = Identities.identity( 1 ); IdentityValue firstValue = new IdentityValue( id ); IdentityValue secondValue = new IdentityValue( id ); @@ -69,10 +68,10 @@ public void testEquals() throws Exception public void testHashCode() throws Exception { // Given - Identity id = identity( 1 ); + Identity id = Identities.identity( 1 ); IdentityValue value = new IdentityValue( id ); // Then assertThat( value.hashCode(), notNullValue() ); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/value/IntegerValueTest.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/value/IntegerValueTest.java index 59cd0d71f8..069ea75e4b 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/value/IntegerValueTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import org.junit.Test; @@ -85,4 +85,4 @@ public void testHashCode() throws Exception // Then assertThat( value.hashCode(), notNullValue() ); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/value/NodeValueTest.java similarity index 89% rename from driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/value/NodeValueTest.java index 3907236a4c..988a8381ec 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/value/NodeValueTest.java @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import org.junit.Test; import java.util.HashMap; -import org.neo4j.driver.Value; -import org.neo4j.driver.internal.SimpleNode; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.internal.SimpleNode; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/value/RelationshipValueTest.java similarity index 91% rename from driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/value/RelationshipValueTest.java index 66b1377320..b3e06216ed 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/value/RelationshipValueTest.java @@ -16,11 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import org.junit.Test; -import org.neo4j.driver.internal.SimpleRelationship; +import org.neo4j.driver.v1.internal.SimpleRelationship; import static org.junit.Assert.assertEquals; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/value/StringValueTest.java similarity index 97% rename from driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java rename to driver/src/test/java/org/neo4j/driver/v1/internal/value/StringValueTest.java index ee7cb7f545..7af7a490d8 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/value/StringValueTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.internal.value; +package org.neo4j.driver.v1.internal.value; import org.junit.Test; diff --git a/driver/src/test/java/org/neo4j/driver/stress/DriverStresser.java b/driver/src/test/java/org/neo4j/driver/v1/stress/DriverStresser.java similarity index 93% rename from driver/src/test/java/org/neo4j/driver/stress/DriverStresser.java rename to driver/src/test/java/org/neo4j/driver/v1/stress/DriverStresser.java index f3c5fe8a83..4b20a45cc3 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/DriverStresser.java +++ b/driver/src/test/java/org/neo4j/driver/v1/stress/DriverStresser.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.stress; +package org.neo4j.driver.v1.stress; import java.util.ArrayList; import java.util.List; @@ -27,14 +27,14 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Driver; -import org.neo4j.driver.Result; -import org.neo4j.driver.Session; -import org.neo4j.driver.Value; -import org.neo4j.driver.util.Neo4jRunner; +import org.neo4j.driver.v1.GraphDatabase; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.util.Neo4jRunner; -import static org.neo4j.driver.Values.parameters; +import static org.neo4j.driver.v1.Values.parameters; public class DriverStresser { diff --git a/driver/src/test/java/org/neo4j/driver/util/BytePrinterTest.java b/driver/src/test/java/org/neo4j/driver/v1/util/BytePrinterTest.java similarity index 92% rename from driver/src/test/java/org/neo4j/driver/util/BytePrinterTest.java rename to driver/src/test/java/org/neo4j/driver/v1/util/BytePrinterTest.java index 3dacebddae..3c8f02917f 100644 --- a/driver/src/test/java/org/neo4j/driver/util/BytePrinterTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/BytePrinterTest.java @@ -16,8 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; +import org.junit.Assert; import org.junit.Test; import java.io.ByteArrayOutputStream; @@ -25,7 +26,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import org.neo4j.driver.internal.util.BytePrinter; +import org.neo4j.driver.v1.internal.util.BytePrinter; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -37,7 +38,7 @@ public class BytePrinterTest @Test public void shouldPrintBytes() throws Throwable { - assertEquals( "01", BytePrinter.hex( (byte) 1 ) ); + Assert.assertEquals( "01", BytePrinter.hex( (byte) 1 ) ); assertEquals( "01 02 03 ", BytePrinter.hex( new byte[]{1, 2, 3} ) ); assertEquals( "hello ", BytePrinter.ljust( "hello", 10 ) ); assertEquals( " hello", BytePrinter.rjust( "hello", 10 ) ); @@ -60,4 +61,4 @@ public void shouldRevertHexStringToBytes() byte[] bytes = BytePrinter.hexStringToBytes( "01 02 03 04\n05\n" ); assertArrayEquals( new byte[]{1, 2, 3, 4, 5}, bytes ); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/util/CertificateToolTest.java b/driver/src/test/java/org/neo4j/driver/v1/util/CertificateToolTest.java similarity index 96% rename from driver/src/test/java/org/neo4j/driver/util/CertificateToolTest.java rename to driver/src/test/java/org/neo4j/driver/v1/util/CertificateToolTest.java index 44c67bb06d..7f43a06512 100644 --- a/driver/src/test/java/org/neo4j/driver/util/CertificateToolTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/CertificateToolTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; @@ -48,11 +48,11 @@ import java.util.Date; import java.util.Enumeration; -import org.neo4j.driver.internal.util.CertificateTool; +import org.neo4j.driver.v1.internal.util.CertificateTool; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.neo4j.driver.internal.util.CertificateTool.saveX509Cert; +import static org.neo4j.driver.v1.internal.util.CertificateTool.saveX509Cert; public class CertificateToolTest { diff --git a/driver/src/test/java/org/neo4j/driver/util/DumpMessage.java b/driver/src/test/java/org/neo4j/driver/v1/util/DumpMessage.java similarity index 90% rename from driver/src/test/java/org/neo4j/driver/util/DumpMessage.java rename to driver/src/test/java/org/neo4j/driver/v1/util/DumpMessage.java index 44ee52b159..7abcb9a474 100644 --- a/driver/src/test/java/org/neo4j/driver/util/DumpMessage.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/DumpMessage.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -27,26 +27,24 @@ import java.util.List; import java.util.Map; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.Neo4jException; -import org.neo4j.driver.internal.connector.socket.ChunkedInput; -import org.neo4j.driver.internal.messaging.AckFailureMessage; -import org.neo4j.driver.internal.messaging.DiscardAllMessage; -import org.neo4j.driver.internal.messaging.FailureMessage; -import org.neo4j.driver.internal.messaging.IgnoredMessage; -import org.neo4j.driver.internal.messaging.InitMessage; -import org.neo4j.driver.internal.messaging.Message; -import org.neo4j.driver.internal.messaging.MessageFormat; -import org.neo4j.driver.internal.messaging.MessageHandler; -import org.neo4j.driver.internal.messaging.PackStreamMessageFormatV1; -import org.neo4j.driver.internal.messaging.PullAllMessage; -import org.neo4j.driver.internal.messaging.RecordMessage; -import org.neo4j.driver.internal.messaging.RunMessage; -import org.neo4j.driver.internal.messaging.SuccessMessage; -import org.neo4j.driver.internal.packstream.PackInput; -import org.neo4j.driver.internal.util.BytePrinter; - -import static org.neo4j.driver.internal.util.BytePrinter.hexStringToBytes; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.Neo4jException; +import org.neo4j.driver.v1.internal.connector.socket.ChunkedInput; +import org.neo4j.driver.v1.internal.messaging.AckFailureMessage; +import org.neo4j.driver.v1.internal.messaging.DiscardAllMessage; +import org.neo4j.driver.v1.internal.messaging.FailureMessage; +import org.neo4j.driver.v1.internal.messaging.IgnoredMessage; +import org.neo4j.driver.v1.internal.messaging.InitMessage; +import org.neo4j.driver.v1.internal.messaging.Message; +import org.neo4j.driver.v1.internal.messaging.MessageFormat; +import org.neo4j.driver.v1.internal.messaging.MessageHandler; +import org.neo4j.driver.v1.internal.messaging.PackStreamMessageFormatV1; +import org.neo4j.driver.v1.internal.messaging.PullAllMessage; +import org.neo4j.driver.v1.internal.messaging.RecordMessage; +import org.neo4j.driver.v1.internal.messaging.RunMessage; +import org.neo4j.driver.v1.internal.messaging.SuccessMessage; +import org.neo4j.driver.v1.internal.packstream.PackInput; +import org.neo4j.driver.v1.internal.util.BytePrinter; public class DumpMessage { @@ -65,7 +63,7 @@ public static void main( String[] args ) hexStr.append( args[i] ); } - byte[] bytes = hexStringToBytes( hexStr.toString() ); + byte[] bytes = BytePrinter.hexStringToBytes( hexStr.toString() ); // for now we only handle PackStreamV1 ArrayList messages = null; diff --git a/driver/src/test/java/org/neo4j/driver/util/FileTools.java b/driver/src/test/java/org/neo4j/driver/v1/util/FileTools.java similarity index 99% rename from driver/src/test/java/org/neo4j/driver/util/FileTools.java rename to driver/src/test/java/org/neo4j/driver/v1/util/FileTools.java index fcdc42a086..d559d397b4 100644 --- a/driver/src/test/java/org/neo4j/driver/util/FileTools.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/FileTools.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import org.rauschig.jarchivelib.ArchiveStream; import org.rauschig.jarchivelib.Archiver; diff --git a/driver/src/test/java/org/neo4j/driver/util/FileToolsTest.java b/driver/src/test/java/org/neo4j/driver/v1/util/FileToolsTest.java similarity index 96% rename from driver/src/test/java/org/neo4j/driver/util/FileToolsTest.java rename to driver/src/test/java/org/neo4j/driver/v1/util/FileToolsTest.java index 1c51085561..28a6786ef0 100644 --- a/driver/src/test/java/org/neo4j/driver/util/FileToolsTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/FileToolsTest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import org.junit.Test; @@ -30,7 +30,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; -import static org.neo4j.driver.util.FileTools.tmpDir; public class FileToolsTest { @@ -38,7 +37,7 @@ public class FileToolsTest public void shouldBeAbleToCreateTemporaryDirectory() throws Throwable { // Given - File dir = tmpDir(); + File dir = FileTools.tmpDir(); // Then try diff --git a/driver/src/test/java/org/neo4j/driver/util/Lists.java b/driver/src/test/java/org/neo4j/driver/v1/util/Lists.java similarity index 96% rename from driver/src/test/java/org/neo4j/driver/util/Lists.java rename to driver/src/test/java/org/neo4j/driver/v1/util/Lists.java index 6e294f4abe..dbd9c2c6ae 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Lists.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/Lists.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import java.util.ArrayList; import java.util.List; diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jDefaultInstaller.java b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jDefaultInstaller.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/util/Neo4jDefaultInstaller.java rename to driver/src/test/java/org/neo4j/driver/v1/util/Neo4jDefaultInstaller.java index c49ba9d6b1..a6fc18fbe7 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Neo4jDefaultInstaller.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jDefaultInstaller.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import org.rauschig.jarchivelib.Archiver; import org.rauschig.jarchivelib.ArchiverFactory; diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jInstaller.java b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jInstaller.java similarity index 96% rename from driver/src/test/java/org/neo4j/driver/util/Neo4jInstaller.java rename to driver/src/test/java/org/neo4j/driver/v1/util/Neo4jInstaller.java index 0a28329412..9c83dcc5b9 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Neo4jInstaller.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jInstaller.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import org.rauschig.jarchivelib.Archiver; @@ -24,8 +24,8 @@ import java.io.IOException; import java.util.Map; -import static org.neo4j.driver.util.FileTools.extractTarball; -import static org.neo4j.driver.util.FileTools.streamFileTo; +import static org.neo4j.driver.v1.util.FileTools.extractTarball; +import static org.neo4j.driver.v1.util.FileTools.streamFileTo; public abstract class Neo4jInstaller { diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jResetMode.java b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jResetMode.java similarity index 95% rename from driver/src/test/java/org/neo4j/driver/util/Neo4jResetMode.java rename to driver/src/test/java/org/neo4j/driver/v1/util/Neo4jResetMode.java index a0fc979e10..add4cdaaeb 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Neo4jResetMode.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jResetMode.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; public enum Neo4jResetMode { diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java similarity index 90% rename from driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java rename to driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java index 5f41cfecbb..968119f63f 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java @@ -16,27 +16,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import java.io.File; import java.io.IOException; import java.net.URI; import java.util.Map; -import org.neo4j.driver.Config; -import org.neo4j.driver.Driver; -import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.connector.socket.SocketClient; -import org.neo4j.driver.internal.logging.DevNullLogger; -import org.neo4j.driver.util.Neo4jInstaller.Neo4jInstallerFactory; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.internal.connector.socket.SocketClient; +import org.neo4j.driver.v1.internal.logging.DevNullLogger; import static java.lang.String.format; import static junit.framework.TestCase.assertFalse; -import static org.neo4j.driver.internal.ConfigTest.deleteDefaultKnownCertFileIfExists; -import static org.neo4j.driver.util.FileTools.deleteRecursively; -import static org.neo4j.driver.util.FileTools.updateProperties; -import static org.neo4j.driver.util.Neo4jInstaller.dbDir; -import static org.neo4j.driver.util.Neo4jInstaller.neo4jHomeDir; +import static org.neo4j.driver.v1.internal.ConfigTest.deleteDefaultKnownCertFileIfExists; +import static org.neo4j.driver.v1.util.FileTools.deleteRecursively; +import static org.neo4j.driver.v1.util.FileTools.updateProperties; /** * This class wraps the neo4j stand-alone jar in some code to help pulling it in from a remote URL and then launching @@ -54,7 +51,7 @@ public class Neo4jRunner private Driver currentDriver; private boolean staleDriver; - private Neo4jInstaller installer = Neo4jInstallerFactory.create(); + private Neo4jInstaller installer = Neo4jInstaller.Neo4jInstallerFactory.create(); public static void main( String... args ) throws Exception { @@ -148,12 +145,12 @@ public synchronized boolean startServerOnEmptyDatabaseUnlessRunning( Neo4jSettin private void doStartServerOnEmptyDatabase() throws Exception { - debug( "Deleting database at: %s", dbDir.getCanonicalPath() ); + debug( "Deleting database at: %s", Neo4jInstaller.dbDir.getCanonicalPath() ); - deleteRecursively( dbDir ); + deleteRecursively( Neo4jInstaller.dbDir ); deleteDefaultKnownCertFileIfExists(); - debug( "Starting server at: ", neo4jHomeDir.getCanonicalPath() ); + debug( "Starting server at: ", Neo4jInstaller.neo4jHomeDir.getCanonicalPath() ); if ( installer.startNeo4j() != 0 ) { @@ -185,7 +182,7 @@ private void doStopServer() throws IOException, InterruptedException private synchronized boolean tryStopServer() throws IOException, InterruptedException { - debug( "Trying to stop server at %s", neo4jHomeDir.getCanonicalPath() ); + debug( "Trying to stop server at %s", Neo4jInstaller.neo4jHomeDir.getCanonicalPath() ); if ( canControlServer() ) { @@ -233,7 +230,7 @@ private void updateServerSettingsFile() return; } - File oldFile = new File( neo4jHomeDir, "conf/neo4j-server.properties" ); + File oldFile = new File( Neo4jInstaller.neo4jHomeDir, "conf/neo4j-server.properties" ); try { debug( "Changing server properties file (for next start): " + oldFile.getCanonicalPath() ); diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jSettings.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java rename to driver/src/test/java/org/neo4j/driver/v1/util/Neo4jSettings.java index 0ef6181965..7c14efa1d6 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jSettings.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import java.util.HashMap; import java.util.Map; diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jWindowsInstaller.java b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jWindowsInstaller.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/util/Neo4jWindowsInstaller.java rename to driver/src/test/java/org/neo4j/driver/v1/util/Neo4jWindowsInstaller.java index d5e51868f9..838291f0ae 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Neo4jWindowsInstaller.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/Neo4jWindowsInstaller.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import org.rauschig.jarchivelib.Archiver; import org.rauschig.jarchivelib.ArchiverFactory; diff --git a/driver/src/test/java/org/neo4j/driver/util/RecordingByteChannel.java b/driver/src/test/java/org/neo4j/driver/v1/util/RecordingByteChannel.java similarity index 98% rename from driver/src/test/java/org/neo4j/driver/util/RecordingByteChannel.java rename to driver/src/test/java/org/neo4j/driver/v1/util/RecordingByteChannel.java index 1dd166c273..789c7334dd 100644 --- a/driver/src/test/java/org/neo4j/driver/util/RecordingByteChannel.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/RecordingByteChannel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/driver/src/test/java/org/neo4j/driver/util/TestNeo4j.java b/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4j.java similarity index 90% rename from driver/src/test/java/org/neo4j/driver/util/TestNeo4j.java rename to driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4j.java index 94cb51555d..9fcc532243 100644 --- a/driver/src/test/java/org/neo4j/driver/util/TestNeo4j.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4j.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import org.junit.rules.TestRule; import org.junit.runner.Description; @@ -27,12 +27,9 @@ import java.io.PrintWriter; import java.net.URL; -import org.neo4j.driver.Driver; -import org.neo4j.driver.Result; -import org.neo4j.driver.Session; - -import static org.neo4j.driver.util.Neo4jResetMode.CLEAR_DATABASE_CONTENTS; -import static org.neo4j.driver.util.Neo4jRunner.DEFAULT_URL; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Session; public class TestNeo4j implements TestRule { @@ -43,7 +40,7 @@ public class TestNeo4j implements TestRule public TestNeo4j() { - this( Neo4jSettings.DEFAULT, CLEAR_DATABASE_CONTENTS ); + this( Neo4jSettings.DEFAULT, Neo4jResetMode.CLEAR_DATABASE_CONTENTS ); } public TestNeo4j( Neo4jResetMode resetMode ) @@ -53,7 +50,7 @@ public TestNeo4j( Neo4jResetMode resetMode ) public TestNeo4j( Neo4jSettings initialSettings ) { - this( initialSettings, CLEAR_DATABASE_CONTENTS ); + this( initialSettings, Neo4jResetMode.CLEAR_DATABASE_CONTENTS ); } public TestNeo4j( Neo4jSettings initialSettings, Neo4jResetMode resetMode ) @@ -121,7 +118,7 @@ public URL putTmpFile( String prefix, String suffix, String contents ) throws IO public String address() { - return DEFAULT_URL; + return Neo4jRunner.DEFAULT_URL; } public boolean canControlServer() diff --git a/driver/src/test/java/org/neo4j/driver/util/TestNeo4jSession.java b/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java similarity index 92% rename from driver/src/test/java/org/neo4j/driver/util/TestNeo4jSession.java rename to driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java index 919a20343c..cd545212c0 100644 --- a/driver/src/test/java/org/neo4j/driver/util/TestNeo4jSession.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.neo4j.driver.util; +package org.neo4j.driver.v1.util; import java.util.Map; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.neo4j.driver.Result; -import org.neo4j.driver.Session; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.Transaction; +import org.neo4j.driver.v1.Value; /** * A little utility for integration testing, this provides tests with a session they can work with. @@ -111,7 +111,7 @@ public Result run( String statementText ) } @Override - public Result run( org.neo4j.driver.Statement statement ) + public Result run( org.neo4j.driver.v1.Statement statement ) { return realSession.run( statement.text(), statement.parameters() ); } From 3ab3e367f06f9c13027b1ec6c8660a32139f4724 Mon Sep 17 00:00:00 2001 From: Stefan Plantikow Date: Fri, 20 Nov 2015 11:37:45 +0100 Subject: [PATCH 2/3] Rename Session.newTransaction() to Session.beginTransaction() --- .../src/main/java/org/neo4j/driver/v1/Driver.java | 2 +- .../src/main/java/org/neo4j/driver/v1/Session.java | 2 +- .../neo4j/driver/v1/internal/StandardSession.java | 2 +- .../org/neo4j/driver/v1/integration/ErrorIT.java | 6 +++--- .../neo4j/driver/v1/integration/TransactionIT.java | 14 +++++++------- .../driver/v1/internal/StandardSessionTest.java | 8 ++++---- .../org/neo4j/driver/v1/util/TestNeo4jSession.java | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/driver/src/main/java/org/neo4j/driver/v1/Driver.java b/driver/src/main/java/org/neo4j/driver/v1/Driver.java index be15a91e94..871a8d0902 100644 --- a/driver/src/main/java/org/neo4j/driver/v1/Driver.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Driver.java @@ -84,7 +84,7 @@ public Driver( URI url, Config config ) /** * Establish a session * @return a session that could be used to run {@link Session#run(String) a statement} or - * {@link Session#newTransaction() a transaction }. + * {@link Session#beginTransaction() a transaction }. */ public Session session() { diff --git a/driver/src/main/java/org/neo4j/driver/v1/Session.java b/driver/src/main/java/org/neo4j/driver/v1/Session.java index c1c72dc1d7..b9d81f6e4e 100644 --- a/driver/src/main/java/org/neo4j/driver/v1/Session.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Session.java @@ -45,7 +45,7 @@ public interface Session extends AutoCloseable, StatementRunner * * @return a new transaction */ - Transaction newTransaction(); + Transaction beginTransaction(); @Override void close(); diff --git a/driver/src/main/java/org/neo4j/driver/v1/internal/StandardSession.java b/driver/src/main/java/org/neo4j/driver/v1/internal/StandardSession.java index a0314c561d..e2c228e688 100644 --- a/driver/src/main/java/org/neo4j/driver/v1/internal/StandardSession.java +++ b/driver/src/main/java/org/neo4j/driver/v1/internal/StandardSession.java @@ -107,7 +107,7 @@ public void close() } @Override - public Transaction newTransaction() + public Transaction beginTransaction() { ensureNoOpenTransaction(); return currentTransaction = new StandardTransaction( connection, txCleanup ); diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/ErrorIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/ErrorIT.java index 45af2e18c0..e7e4a2081c 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/integration/ErrorIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/ErrorIT.java @@ -56,7 +56,7 @@ public void shouldThrowHelpfulSyntaxError() throws Throwable public void shouldNotAllowMoreTxAfterClientException() throws Throwable { // Given - Transaction tx = session.newTransaction(); + Transaction tx = session.beginTransaction(); // And Given an error has occurred try { tx.run( "invalid" ); } catch ( ClientException e ) {} @@ -87,14 +87,14 @@ public void shouldAllowNewStatementAfterRecoverableError() throws Throwable public void shouldAllowNewTransactionAfterRecoverableError() throws Throwable { // Given an error has occurred in a prior transaction - try ( Transaction tx = session.newTransaction() ) + try ( Transaction tx = session.beginTransaction() ) { tx.run( "invalid" ); } catch ( ClientException e ) {} // When - try ( Transaction tx = session.newTransaction() ) + try ( Transaction tx = session.beginTransaction() ) { int val = tx.run( "RETURN 1" ).single().get( "1" ).javaInteger(); diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java index a4c903cce3..0c8a253eb3 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java @@ -43,7 +43,7 @@ public class TransactionIT public void shouldRunAndCommit() throws Throwable { // When - try ( Transaction tx = session.newTransaction() ) + try ( Transaction tx = session.beginTransaction() ) { tx.run( "CREATE (n:FirstNode)" ); tx.run( "CREATE (n:SecondNode)" ); @@ -60,7 +60,7 @@ public void shouldRunAndCommit() throws Throwable public void shouldRunAndRollbackByDefault() throws Throwable { // When - try ( Transaction tx = session.newTransaction() ) + try ( Transaction tx = session.beginTransaction() ) { tx.run( "CREATE (n:FirstNode)" ); tx.run( "CREATE (n:SecondNode)" ); @@ -78,7 +78,7 @@ public void shouldRetrieveResults() throws Throwable session.run( "CREATE (n {name:'Steve Brook'})" ); // When - try ( Transaction tx = session.newTransaction() ) + try ( Transaction tx = session.beginTransaction() ) { Result res = tx.run( "MATCH (n) RETURN n.name" ); @@ -91,7 +91,7 @@ public void shouldRetrieveResults() throws Throwable public void shouldNotAllowSessionLevelStatementsWhenThereIsATransaction() throws Throwable { // Given - session.newTransaction(); + session.beginTransaction(); // Expect exception.expect( ClientException.class ); @@ -104,7 +104,7 @@ public void shouldNotAllowSessionLevelStatementsWhenThereIsATransaction() throws public void shouldBeClosedAfterRollback() throws Throwable { // When - Transaction tx = session.newTransaction(); + Transaction tx = session.beginTransaction(); tx.close(); // Then @@ -115,7 +115,7 @@ public void shouldBeClosedAfterRollback() throws Throwable public void shouldBeClosedAfterCommit() throws Throwable { // When - Transaction tx = session.newTransaction(); + Transaction tx = session.beginTransaction(); tx.success(); tx.close(); @@ -127,7 +127,7 @@ public void shouldBeClosedAfterCommit() throws Throwable public void shouldBeOpenBeforeCommit() throws Throwable { // When - Transaction tx = session.newTransaction(); + Transaction tx = session.beginTransaction(); // Then assertTrue( tx.isOpen() ); diff --git a/driver/src/test/java/org/neo4j/driver/v1/internal/StandardSessionTest.java b/driver/src/test/java/org/neo4j/driver/v1/internal/StandardSessionTest.java index f787dcc16d..baa603383e 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/internal/StandardSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/internal/StandardSessionTest.java @@ -55,13 +55,13 @@ public void shouldNotAllowNewTxWhileOneIsRunning() throws Throwable // Given Connection mock = mock( Connection.class ); StandardSession sess = new StandardSession( mock ); - sess.newTransaction(); + sess.beginTransaction(); // Expect exception.expect( ClientException.class ); // When - sess.newTransaction(); + sess.beginTransaction(); } @Test @@ -70,10 +70,10 @@ public void shouldBeAbleToOpenTxAfterPreviousIsClosed() throws Throwable // Given Connection mock = mock( Connection.class ); StandardSession sess = new StandardSession( mock ); - sess.newTransaction().close(); + sess.beginTransaction().close(); // When - Transaction tx = sess.newTransaction(); + Transaction tx = sess.beginTransaction(); // Then we should've gotten a transaction object back assertNotNull( tx ); diff --git a/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java b/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java index cd545212c0..f0f64f22d8 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java @@ -93,9 +93,9 @@ public void close() } @Override - public Transaction newTransaction() + public Transaction beginTransaction() { - return realSession.newTransaction(); + return realSession.beginTransaction(); } @Override From 1a54da0a12758d19d9ac906922a782d2744c72af Mon Sep 17 00:00:00 2001 From: Jacob Hansson Date: Fri, 20 Nov 2015 14:46:34 -0600 Subject: [PATCH 3/3] Fix docs for beginTransaction --- driver/src/main/java/org/neo4j/driver/v1/Driver.java | 2 +- driver/src/main/java/org/neo4j/driver/v1/Transaction.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/driver/src/main/java/org/neo4j/driver/v1/Driver.java b/driver/src/main/java/org/neo4j/driver/v1/Driver.java index 871a8d0902..43ce287325 100644 --- a/driver/src/main/java/org/neo4j/driver/v1/Driver.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Driver.java @@ -40,7 +40,7 @@ * session.run( "CREATE (n {name:'Bob'})" ); * * // Or, run multiple statements together in an atomic transaction: - * try( Transaction tx = session.newTransaction() ) + * try( Transaction tx = session.beginTransaction() ) * { * tx.run( "CREATE (n {name:'Alice'})" ); * tx.run( "CREATE (n {name:'Tina'})" ); diff --git a/driver/src/main/java/org/neo4j/driver/v1/Transaction.java b/driver/src/main/java/org/neo4j/driver/v1/Transaction.java index 37c7de992b..5fac14d457 100644 --- a/driver/src/main/java/org/neo4j/driver/v1/Transaction.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Transaction.java @@ -29,7 +29,7 @@ * * 
  * {@code
- * try( Transaction tx = session.newTransaction() )
+ * try( Transaction tx = session.beginTransaction() )
  * {
  *     tx.run( "CREATE (n)" );
  *     tx.success();
@@ -56,7 +56,7 @@ public interface Transaction extends AutoCloseable, StatementRunner
      *
      * 
      * {@code
-     * try(Transaction tx = session.newTransaction() )
+     * try(Transaction tx = session.beginTransaction() )
      * {
      *     tx.run( "CREATE (n)" );
      *     tx.failure();
MarkerBinaryTypeDescription
00..7F0xxxxxxx+TINY_INTInteger 0 to 127
80..8F1000xxxxTINY_STRING