diff --git a/api-v1/pom.xml b/api-v1/pom.xml new file mode 100644 index 0000000000..039c6d9d40 --- /dev/null +++ b/api-v1/pom.xml @@ -0,0 +1,14 @@ + + + + neo4j-java-driver-parent + org.neo4j.driver + 1.0-SNAPSHOT + + 4.0.0 + + neo4j-driver-api-v1 + + \ No newline at end of file diff --git a/driver/module-rules.xml b/driver/module-rules.xml new file mode 100644 index 0000000000..dff425a3ea --- /dev/null +++ b/driver/module-rules.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/driver/pom.xml b/driver/pom.xml index caa300c8b7..049e64416d 100644 --- a/driver/pom.xml +++ b/driver/pom.xml @@ -29,6 +29,11 @@ + + org.neo4j.driver + neo4j-driver-api-v1 + ${project.version} + org.hamcrest @@ -153,6 +158,23 @@ + + + de.andrena.tools.macker + macker-maven-plugin + 1.0.2 + + module-rules.xml + + + + compile + + macker + + + + diff --git a/driver/src/main/java/org/neo4j/driver/GraphDatabase.java b/driver/src/main/java/org/neo4j/driver/GraphDatabase.java index 013d8d7467..d88cff0e11 100644 --- a/driver/src/main/java/org/neo4j/driver/GraphDatabase.java +++ b/driver/src/main/java/org/neo4j/driver/GraphDatabase.java @@ -20,12 +20,19 @@ import java.net.URI; +import org.neo4j.driver.internal.StandardDriverV1; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.Driver; + /** * Creates {@link Driver drivers}, optionally letting you {@link #driver(URI, Config)} to configure them. * @see Driver */ public class GraphDatabase { + // This is explicitly and consciously placed outside the versioned API package. This class is an entry point into the API, it + // is the glue that connects the standard implementation (eg. the stuff under 'internal') with the API. + /** * Return a driver for a Neo4j instance with the default configuration settings * @@ -57,6 +64,6 @@ public static Driver driver( URI url ) */ public static Driver driver( URI url, Config config ) { - return new Driver( url, config ); + return new StandardDriverV1( url, config ); } } diff --git a/driver/src/main/java/org/neo4j/driver/internal/Identities.java b/driver/src/main/java/org/neo4j/driver/internal/Identities.java index 1af4c30e97..4db07fd742 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/Identities.java +++ b/driver/src/main/java/org/neo4j/driver/internal/Identities.java @@ -18,7 +18,7 @@ */ package org.neo4j.driver.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/internal/ParameterSupport.java index 29ddaa45e1..7f4f8f636a 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/ParameterSupport.java +++ b/driver/src/main/java/org/neo4j/driver/internal/ParameterSupport.java @@ -21,7 +21,7 @@ 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/internal/SimpleEntity.java index 6289fcb85a..42dbcc6a3f 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleEntity.java +++ b/driver/src/main/java/org/neo4j/driver/internal/SimpleEntity.java @@ -21,9 +21,9 @@ 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/internal/SimpleIdentity.java index dd535c6a2c..2488750e0e 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleIdentity.java +++ b/driver/src/main/java/org/neo4j/driver/internal/SimpleIdentity.java @@ -18,7 +18,7 @@ */ package org.neo4j.driver.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/internal/SimpleNode.java index dd1132725a..b45bdd3340 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleNode.java +++ b/driver/src/main/java/org/neo4j/driver/internal/SimpleNode.java @@ -22,12 +22,12 @@ 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 org.neo4j.driver.v1.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/internal/SimplePath.java index 0646b7b361..d15cb80003 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimplePath.java +++ b/driver/src/main/java/org/neo4j/driver/internal/SimplePath.java @@ -23,13 +23,13 @@ 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 org.neo4j.driver.v1.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/internal/SimpleRecord.java index 955a16208b..1bcc204615 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleRecord.java +++ b/driver/src/main/java/org/neo4j/driver/internal/SimpleRecord.java @@ -22,8 +22,8 @@ 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/internal/SimpleRelationship.java index 3d620e23bb..674043d836 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleRelationship.java +++ b/driver/src/main/java/org/neo4j/driver/internal/SimpleRelationship.java @@ -21,13 +21,13 @@ 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 org.neo4j.driver.v1.Relationship} implementation that directly contains type and properties + * along with {@link org.neo4j.driver.v1.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/internal/SimpleResult.java index 5ed7357195..ca9e56b972 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SimpleResult.java +++ b/driver/src/main/java/org/neo4j/driver/internal/SimpleResult.java @@ -21,12 +21,12 @@ 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/StandardDriverV1.java b/driver/src/main/java/org/neo4j/driver/internal/StandardDriverV1.java new file mode 100644 index 0000000000..1661e1d68a --- /dev/null +++ b/driver/src/main/java/org/neo4j/driver/internal/StandardDriverV1.java @@ -0,0 +1,64 @@ +/** + * Copyright (c) 2002-2015 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.neo4j.driver.internal; + +import java.net.URI; + +import org.neo4j.driver.internal.pool.StandardConnectionPool; +import org.neo4j.driver.internal.spi.ConnectionPool; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.Session; + +public class StandardDriverV1 implements Driver, AutoCloseable +{ + private final ConnectionPool connections; + private final URI url; + + public StandardDriverV1( URI url, Config config ) + { + this.url = url; + this.connections = new StandardConnectionPool( 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 }. + */ + @Override + public Session session() + { + return new StandardSession( connections.acquire( url ) ); + // TODO a ConnectionPool per URL + // ConnectionPool connections = new StandardConnectionPool( logging, url ); + // And to get a connection from the pool could be + // connections.acquire(); + } + + /** + * Close all the resources assigned to this driver + * @throws Exception any error that might happen when releasing all resources + */ + @Override + public void close() throws Exception + { + connections.close(); + } +} diff --git a/driver/src/main/java/org/neo4j/driver/internal/StandardSession.java b/driver/src/main/java/org/neo4j/driver/internal/StandardSession.java index ed9ce43746..6edb2ae977 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/StandardSession.java +++ b/driver/src/main/java/org/neo4j/driver/internal/StandardSession.java @@ -20,14 +20,14 @@ 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; 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/internal/StandardTransaction.java index b822dbb7e5..bd5c71be45 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/StandardTransaction.java +++ b/driver/src/main/java/org/neo4j/driver/internal/StandardTransaction.java @@ -21,14 +21,14 @@ 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; public class StandardTransaction implements Transaction { @@ -67,7 +67,7 @@ public StandardTransaction( Connection conn, Runnable cleanup ) this.cleanup = cleanup; // Note there is no sync here, so this will just get queued locally - conn.run( "BEGIN", Collections.emptyMap(), null ); + conn.run( "BEGIN", Collections.emptyMap(), null ); conn.discardAll(); } diff --git a/driver/src/main/java/org/neo4j/driver/internal/Version.java b/driver/src/main/java/org/neo4j/driver/internal/Version.java index a46c135788..cc690ca0e5 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/Version.java +++ b/driver/src/main/java/org/neo4j/driver/internal/Version.java @@ -18,7 +18,7 @@ */ package org.neo4j.driver.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/internal/connector/socket/AllOrNothingChannel.java index 9a6de072e3..c7d7ec870d 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/AllOrNothingChannel.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/AllOrNothingChannel.java @@ -23,7 +23,7 @@ import java.nio.channels.ByteChannel; import java.nio.channels.SocketChannel; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.internal.util.BytePrinter; /** diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedInput.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedInput.java index f2c081e555..8164481119 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedInput.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedInput.java @@ -24,7 +24,7 @@ import java.nio.channels.ClosedByInterruptException; import java.nio.channels.ReadableByteChannel; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.internal.packstream.PackInput; import org.neo4j.driver.internal.util.BytePrinter; diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedOutput.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedOutput.java index c4d9a4fb64..9c896cb17f 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedOutput.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedOutput.java @@ -22,7 +22,7 @@ import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.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/internal/connector/socket/LoggingByteChannel.java index ebaa187038..c968b01237 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingByteChannel.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingByteChannel.java @@ -22,7 +22,7 @@ import java.nio.ByteBuffer; import java.nio.channels.ByteChannel; -import org.neo4j.driver.internal.spi.Logger; +import org.neo4j.driver.v1.logging.Logger; import org.neo4j.driver.internal.util.BytePrinter; /** diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandler.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandler.java index 0783ed6cf1..e067ebe354 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandler.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandler.java @@ -21,8 +21,8 @@ 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.logging.Logger; import static org.neo4j.driver.internal.messaging.AckFailureMessage.ACK_FAILURE; import static org.neo4j.driver.internal.messaging.DiscardAllMessage.DISCARD_ALL; diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLContextFactory.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLContextFactory.java index a2ead8eac9..869db42b7c 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLContextFactory.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLContextFactory.java @@ -26,7 +26,7 @@ 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; @@ -35,9 +35,9 @@ class SSLContextFactory private final String host; private final int port; - private final TlsAuthenticationConfig authConfig; + private final Config.TLSConfig authConfig; - SSLContextFactory( String host, int port, TlsAuthenticationConfig authConfig ) + SSLContextFactory( String host, int port, Config.TLSConfig 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/internal/connector/socket/SSLSocketChannel.java index 4e4052310a..8a5a29d011 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannel.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannel.java @@ -30,9 +30,9 @@ 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.v1.Config.TLSConfig; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.logging.Logger; import org.neo4j.driver.internal.util.BytePrinter; import static javax.net.ssl.SSLEngineResult.HandshakeStatus.FINISHED; @@ -65,7 +65,7 @@ public class SSLSocketChannel implements ByteChannel private ByteBuffer plainOut; public SSLSocketChannel( String host, int port, SocketChannel channel, Logger logger, - TlsAuthenticationConfig authConfig ) + TLSConfig authConfig ) throws GeneralSecurityException, IOException { logger.debug( "TLS connection enabled" ); diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketClient.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketClient.java index cc4f4a9847..3f5cd296fc 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketClient.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketClient.java @@ -28,12 +28,12 @@ import java.security.GeneralSecurityException; import java.util.List; -import org.neo4j.driver.Config; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.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.logging.Logger; public class SocketClient { diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java index 5bb4d34031..ab1eb31e5c 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnection.java @@ -23,15 +23,15 @@ 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.v1.Config; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.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.v1.logging.Logger; import org.neo4j.driver.internal.spi.StreamCollector; import static org.neo4j.driver.internal.messaging.DiscardAllMessage.DISCARD_ALL; diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnector.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnector.java index 8b3d599f99..c766f30ca2 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnector.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketConnector.java @@ -21,8 +21,8 @@ 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; import org.neo4j.driver.internal.Version; import org.neo4j.driver.internal.spi.Connection; import org.neo4j.driver.internal.spi.Connector; @@ -31,16 +31,19 @@ public class SocketConnector implements Connector { + public static String SCHEME = "bolt"; + public static int DEFAULT_PORT = 7687; + @Override public boolean supports( String scheme ) { - return scheme.equals( Config.SCHEME ); + return scheme.equals( SCHEME ); } @Override public Connection connect( URI sessionURI, Config config ) throws ClientException { - int port = sessionURI.getPort() == -1 ? Config.DEFAULT_PORT : sessionURI.getPort(); + int port = sessionURI.getPort() == -1 ? DEFAULT_PORT : sessionURI.getPort(); SocketConnection conn = new SocketConnection( sessionURI.getHost(), port, config ); conn.init( "bolt-java-driver/" + Version.driverVersion() ); return conn; @@ -49,6 +52,6 @@ public Connection connect( URI sessionURI, Config config ) throws ClientExceptio @Override public Collection supportedSchemes() { - return asList( Config.SCHEME ); + return asList( SCHEME ); } } diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandler.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandler.java index cfdd6fecd8..3d92beb0a1 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandler.java +++ b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandler.java @@ -21,12 +21,12 @@ 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.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.internal.summary.SimpleNotification; import org.neo4j.driver.internal.summary.SimplePlan; import org.neo4j.driver.internal.summary.SimpleProfiledPlan; diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/MessageHandler.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/MessageHandler.java index f0707ce645..0faf0ea01c 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/MessageHandler.java +++ b/driver/src/main/java/org/neo4j/driver/internal/messaging/MessageHandler.java @@ -21,7 +21,7 @@ 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/internal/messaging/PackStreamMessageFormatV1.java index b93c96a03d..907b6d5bde 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java +++ b/driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java @@ -28,13 +28,6 @@ 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; @@ -47,13 +40,20 @@ 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.values.ListValue; +import org.neo4j.driver.v1.values.MapValue; +import org.neo4j.driver.v1.values.NodeValue; +import org.neo4j.driver.v1.values.PathValue; +import org.neo4j.driver.v1.values.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/RecordMessage.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/RecordMessage.java index a4fa86ae86..c65e1dea3d 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/RecordMessage.java +++ b/driver/src/main/java/org/neo4j/driver/internal/messaging/RecordMessage.java @@ -21,7 +21,7 @@ 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/internal/messaging/RunMessage.java index a0fea906c3..5adaeb0d80 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/RunMessage.java +++ b/driver/src/main/java/org/neo4j/driver/internal/messaging/RunMessage.java @@ -21,7 +21,7 @@ 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/internal/messaging/SuccessMessage.java index e85db61e3a..e7dffa99e9 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/SuccessMessage.java +++ b/driver/src/main/java/org/neo4j/driver/internal/messaging/SuccessMessage.java @@ -21,7 +21,7 @@ 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/pool/Allocator.java b/driver/src/main/java/org/neo4j/driver/internal/pool/Allocator.java index 5cbd660a34..a008cbc068 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/Allocator.java +++ b/driver/src/main/java/org/neo4j/driver/internal/pool/Allocator.java @@ -18,7 +18,7 @@ */ package org.neo4j.driver.internal.pool; -import org.neo4j.driver.exceptions.Neo4jException; +import org.neo4j.driver.v1.exceptions.Neo4jException; import org.neo4j.driver.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 org.neo4j.driver.v1.exceptions.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/internal/pool/PooledConnection.java index 4d58b8bcdc..77260330ac 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnection.java +++ b/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnection.java @@ -20,8 +20,8 @@ import java.util.Map; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.Neo4jException; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.Neo4jException; import org.neo4j.driver.internal.spi.Connection; import org.neo4j.driver.internal.spi.StreamCollector; import org.neo4j.driver.internal.util.Consumer; diff --git a/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnectionValidator.java b/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnectionValidator.java index a8f86cfb2c..53373a3234 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnectionValidator.java +++ b/driver/src/main/java/org/neo4j/driver/internal/pool/PooledConnectionValidator.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; import org.neo4j.driver.internal.spi.StreamCollector; /** diff --git a/driver/src/main/java/org/neo4j/driver/internal/pool/StandardConnectionPool.java b/driver/src/main/java/org/neo4j/driver/internal/pool/StandardConnectionPool.java index 6d2eaf7e93..ca2bfdeb8f 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/StandardConnectionPool.java +++ b/driver/src/main/java/org/neo4j/driver/internal/pool/StandardConnectionPool.java @@ -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; /** * 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/internal/pool/ThreadCachingPool.java index dd0c28a1a8..9c3166b273 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/pool/ThreadCachingPool.java +++ b/driver/src/main/java/org/neo4j/driver/internal/pool/ThreadCachingPool.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.neo4j.driver.exceptions.Neo4jException; +import org.neo4j.driver.v1.exceptions.Neo4jException; import org.neo4j.driver.internal.util.Clock; import org.neo4j.driver.internal.util.Consumer; diff --git a/driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java b/driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java index dec77ed17f..db7724a685 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java +++ b/driver/src/main/java/org/neo4j/driver/internal/spi/Connection.java @@ -20,7 +20,7 @@ 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/Connector.java b/driver/src/main/java/org/neo4j/driver/internal/spi/Connector.java index 8e1813b64f..60ded150cc 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/Connector.java +++ b/driver/src/main/java/org/neo4j/driver/internal/spi/Connector.java @@ -21,8 +21,8 @@ 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/StreamCollector.java b/driver/src/main/java/org/neo4j/driver/internal/spi/StreamCollector.java index d5acc1d284..c6b131eda7 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/StreamCollector.java +++ b/driver/src/main/java/org/neo4j/driver/internal/spi/StreamCollector.java @@ -20,12 +20,13 @@ 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/internal/summary/ResultBuilder.java index af11a8b23d..e1d28b493c 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/ResultBuilder.java +++ b/driver/src/main/java/org/neo4j/driver/internal/summary/ResultBuilder.java @@ -25,19 +25,19 @@ 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 static java.util.Collections.unmodifiableMap; import static org.neo4j.driver.internal.ParameterSupport.NO_PARAMETERS; @@ -49,7 +49,7 @@ public class ResultBuilder implements StreamCollector private List body = new ArrayList<>(); private Map fieldLookup = null; - public ResultBuilder( String statement, Map parameters ) + public ResultBuilder( String statement, Map parameters ) { Map unmodifiableParameters = parameters.isEmpty() ? NO_PARAMETERS : unmodifiableMap( parameters ); diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleInputPosition.java b/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleInputPosition.java index 8b80697c4e..026a86feaf 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleInputPosition.java +++ b/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleInputPosition.java @@ -18,7 +18,7 @@ */ package org.neo4j.driver.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/internal/summary/SimpleNotification.java index 8aa929b2cd..d39be79a78 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleNotification.java +++ b/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleNotification.java @@ -18,10 +18,10 @@ */ package org.neo4j.driver.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/internal/summary/SimplePlan.java index d815c7c0ff..209e49a079 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimplePlan.java +++ b/driver/src/main/java/org/neo4j/driver/internal/summary/SimplePlan.java @@ -22,19 +22,19 @@ 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 { private final String operatorType; private final List identifiers; - private final Map arguments; + private final Map arguments; private final List children; // Only call when sub-classing, for constructing plans, use .plan instead diff --git a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleProfiledPlan.java b/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleProfiledPlan.java index b7ad1874d8..72c5f50b46 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleProfiledPlan.java +++ b/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleProfiledPlan.java @@ -21,9 +21,9 @@ 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/internal/summary/SimpleUpdateStatistics.java index c392578a2f..b60a83c038 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleUpdateStatistics.java +++ b/driver/src/main/java/org/neo4j/driver/internal/summary/SimpleUpdateStatistics.java @@ -18,7 +18,7 @@ */ package org.neo4j.driver.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/internal/summary/SummaryBuilder.java index 2507b54da0..680b6f53b8 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/summary/SummaryBuilder.java +++ b/driver/src/main/java/org/neo4j/driver/internal/summary/SummaryBuilder.java @@ -21,16 +21,16 @@ 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 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 static org.neo4j.driver.internal.summary.SimpleUpdateStatistics.EMPTY_STATS; 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 89% 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..798458a2f3 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.logging.JULogging; +import org.neo4j.driver.v1.logging.Logging; -import static org.neo4j.driver.Config.TlsAuthenticationConfig.*; +import static org.neo4j.driver.v1.Config.TLSConfig.usingKnownCerts; /** * A configuration class to config driver properties. @@ -41,9 +41,6 @@ */ public class Config { - public static final String SCHEME = "bolt"; - public static final int DEFAULT_PORT = 7687; - /** User defined logging */ private final Logging logging; @@ -57,7 +54,7 @@ public class Config private final boolean isTlsEnabled; /* Defines how to authenticate a server in TLS connections */ - private TlsAuthenticationConfig tlsAuthConfig; + private TLSConfig tlsAuthConfig; private Config( ConfigBuilder builder ) { @@ -111,7 +108,7 @@ public boolean isTlsEnabled() * Specify an approach to authenticate the server when establishing TLS connections with the server * @return a TLS configuration */ - public TlsAuthenticationConfig tlsAuthConfig() + public TLSConfig tlsAuthConfig() { return tlsAuthConfig; } @@ -142,7 +139,7 @@ public static class ConfigBuilder private int connectionPoolSize = 10; private long idleTimeBeforeConnectionTest = 200; private boolean isTlsEnabled = false; - private TlsAuthenticationConfig tlsAuthConfig = + private TLSConfig tlsAuthConfig = usingKnownCerts( new File( System.getProperty( "user.home" ), "neo4j/neo4j_known_certs" ) ); private ConfigBuilder() {} @@ -203,7 +200,7 @@ public ConfigBuilder withTlsEnabled( boolean value ) * @param tlsAuthConfig TLS authentication config * @return this builder */ - public ConfigBuilder withTlsAuthConfig( TlsAuthenticationConfig tlsAuthConfig ) + public ConfigBuilder withTlsAuthConfig( TLSConfig tlsAuthConfig ) { this.tlsAuthConfig = tlsAuthConfig; return this; @@ -220,9 +217,9 @@ public Config toConfig() } /** - * A configuration to configure TLS authentication + * TLS configuration. */ - public static class TlsAuthenticationConfig + public static class TLSConfig { private enum Mode { @@ -232,7 +229,7 @@ private enum Mode private final Mode mode; private final File certFile; - private TlsAuthenticationConfig( Mode mode, File certFile ) + private TLSConfig( Mode mode, File certFile ) { this.mode = mode; this.certFile = certFile; @@ -264,9 +261,9 @@ public File certFile() * @param certFile the trusted certificate file * @return an authentication config */ - public static TlsAuthenticationConfig usingTrustedCert( File certFile ) + public static TLSConfig usingTrustedCert( File certFile ) { - return new TlsAuthenticationConfig( Mode.TRUSTED_CERT, certFile ); + return new TLSConfig( Mode.TRUSTED_CERT, certFile ); } /** @@ -284,9 +281,9 @@ public static TlsAuthenticationConfig usingTrustedCert( File certFile ) * @param certFile the new file where known certificates are stored. * @return an authentication config */ - public static TlsAuthenticationConfig usingKnownCerts( File certFile ) + public static TLSConfig usingKnownCerts( File certFile ) { - return new TlsAuthenticationConfig( Mode.KNOWN_CERTS, certFile ); + return new TLSConfig( Mode.KNOWN_CERTS, certFile ); } } } 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 72% 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..f18e14e733 100644 --- a/driver/src/main/java/org/neo4j/driver/Driver.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Driver.java @@ -16,14 +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; import java.net.URI; -import org.neo4j.driver.internal.StandardSession; -import org.neo4j.driver.internal.pool.StandardConnectionPool; -import org.neo4j.driver.internal.spi.ConnectionPool; - /** * A Neo4j database driver, through which you can create {@link Session sessions} to run statements against the database. *

@@ -70,37 +66,12 @@ * to use the same driver instance across your application. You can control the connection pooling behavior when you * create the driver using the {@link Config} you pass into {@link GraphDatabase#driver(URI, Config)}. */ -public class Driver implements AutoCloseable +public interface Driver extends AutoCloseable { - private final ConnectionPool connections; - private final URI url; - - public Driver( URI url, Config config ) - { - this.url = url; - this.connections = new StandardConnectionPool( 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 }. */ - public Session session() - { - return new StandardSession( connections.acquire( url ) ); - // TODO a ConnectionPool per URL - // ConnectionPool connections = new StandardConnectionPool( logging, url ); - // And to get a connection from the pool could be - // connections.acquire(); - } - - /** - * Close all the resources assigned to this driver - * @throws Exception any error that might happen when releasing all resources - */ - public void close() throws Exception - { - connections.close(); - } + Session session(); } 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/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..1965266d69 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. 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..d5df485a41 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,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 result of running a statement, a stream of records. The result interface can be used to iterate over all the @@ -36,7 +36,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 +83,7 @@ public interface Result * * * @return a single record from the stream - * @throws org.neo4j.driver.exceptions.ClientException if the stream is empty + * @throws org.neo4j.driver.v1.exceptions.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..699a0c136d 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. 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 92% 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..16d2a1b3be 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,22 @@ * 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 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 { @@ -44,7 +42,7 @@ public Statement( String text, Map parameters ) { this.text = text; this.parameters = parameters == null || parameters.isEmpty() - ? ParameterSupport.NO_PARAMETERS + ? Collections.emptyMap() : Collections.unmodifiableMap( parameters ); } 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..fbc0246357 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.values.BooleanValue; +import org.neo4j.driver.v1.values.FloatValue; +import org.neo4j.driver.v1.values.IdentityValue; +import org.neo4j.driver.v1.values.IntegerValue; +import org.neo4j.driver.v1.values.ListValue; +import org.neo4j.driver.v1.values.MapValue; +import org.neo4j.driver.v1.values.NodeValue; +import org.neo4j.driver.v1.values.PathValue; +import org.neo4j.driver.v1.values.RelationshipValue; +import org.neo4j.driver.v1.values.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/logging/ConsoleLogging.java b/driver/src/main/java/org/neo4j/driver/v1/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/logging/ConsoleLogging.java index 52b995c3bf..06fba38ebf 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/ConsoleLogging.java +++ b/driver/src/main/java/org/neo4j/driver/v1/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.logging; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -27,9 +27,6 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.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/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/logging/DevNullLogger.java index a1aed773dd..134534983b 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java +++ b/driver/src/main/java/org/neo4j/driver/v1/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.logging; -import org.neo4j.driver.internal.spi.Logger; +import org.neo4j.driver.v1.logging.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/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/logging/JULogger.java index 0f391f50ec..dfc9e663c9 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java +++ b/driver/src/main/java/org/neo4j/driver/v1/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.logging; import java.util.logging.Level; -import org.neo4j.driver.internal.spi.Logger; +import org.neo4j.driver.v1.logging.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/logging/JULogging.java similarity index 88% rename from driver/src/main/java/org/neo4j/driver/internal/logging/JULogging.java rename to driver/src/main/java/org/neo4j/driver/v1/logging/JULogging.java index ebf4904699..faeac48503 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/JULogging.java +++ b/driver/src/main/java/org/neo4j/driver/v1/logging/JULogging.java @@ -16,13 +16,10 @@ * 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.logging; import java.util.logging.Level; -import org.neo4j.driver.internal.spi.Logger; -import org.neo4j.driver.internal.spi.Logging; - public class JULogging implements Logging { private final Level loggingLevel; diff --git a/driver/src/main/java/org/neo4j/driver/internal/spi/Logger.java b/driver/src/main/java/org/neo4j/driver/v1/logging/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/logging/Logger.java index a34a3eb11f..3b54a0c8b3 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/Logger.java +++ b/driver/src/main/java/org/neo4j/driver/v1/logging/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.logging; 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/logging/Logging.java similarity index 95% rename from driver/src/main/java/org/neo4j/driver/internal/spi/Logging.java rename to driver/src/main/java/org/neo4j/driver/v1/logging/Logging.java index c0821e98ae..2af6c2e70f 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/spi/Logging.java +++ b/driver/src/main/java/org/neo4j/driver/v1/logging/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.logging; public interface Logging { diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/BooleanValue.java b/driver/src/main/java/org/neo4j/driver/v1/values/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/values/BooleanValue.java index 9a2d38ae60..c49d0a89b5 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/BooleanValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/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.values; 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/values/FloatValue.java similarity index 98% rename from driver/src/main/java/org/neo4j/driver/internal/value/FloatValue.java rename to driver/src/main/java/org/neo4j/driver/v1/values/FloatValue.java index a42e872f60..a8dc1c9a59 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/FloatValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/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.values; 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/values/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/values/IdentityValue.java index 93cee57e69..71d2a49f8b 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/IdentityValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/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.values; -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/values/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/values/IntegerValue.java index fe3c4a4278..528565f024 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/IntegerValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/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.values; 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/values/ListValue.java similarity index 96% rename from driver/src/main/java/org/neo4j/driver/internal/value/ListValue.java rename to driver/src/main/java/org/neo4j/driver/v1/values/ListValue.java index 1f733a8376..1fd46c40fc 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/ListValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/ListValue.java @@ -16,15 +16,16 @@ * 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.values; 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.Function; +import org.neo4j.driver.v1.Value; + 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/values/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/values/MapValue.java index 7b5058e992..a8f6ba3bdb 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/MapValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/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.values; 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.Function; +import org.neo4j.driver.v1.Value; 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/values/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/values/NodeValue.java index 0b470c2417..8965fcb868 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/NodeValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/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.values; -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/values/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/values/PathValue.java index c6865e66a2..675537aba8 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/PathValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/PathValue.java @@ -16,19 +16,19 @@ * 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.values; public class PathValue extends ValueAdapter { - private final org.neo4j.driver.Path adapted; + private final org.neo4j.driver.v1.Path adapted; - public PathValue( org.neo4j.driver.Path adapted ) + public PathValue( org.neo4j.driver.v1.Path adapted ) { this.adapted = adapted; } @Override - public org.neo4j.driver.Path asPath() + public org.neo4j.driver.v1.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/values/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/values/RelationshipValue.java index 3408585424..604e4a7887 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/RelationshipValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/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.values; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Relationship; +import org.neo4j.driver.v1.Value; 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/values/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/values/StringValue.java index d0abcdbe6e..adca7f9212 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/StringValue.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/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.values; 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/values/ValueAdapter.java similarity index 90% rename from driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java rename to driver/src/main/java/org/neo4j/driver/v1/values/ValueAdapter.java index fdba5dda1a..21708045bd 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java +++ b/driver/src/main/java/org/neo4j/driver/v1/values/ValueAdapter.java @@ -16,25 +16,25 @@ * 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.values; 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.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 static java.util.Collections.emptyList; -public abstract class ValueAdapter implements Value +abstract class ValueAdapter implements Value { @Override public String javaString() diff --git a/driver/src/test/java/org/neo4j/driver/ParametersTest.java b/driver/src/test/java/org/neo4j/driver/ParametersTest.java index abd2593568..6a9db8b67e 100644 --- a/driver/src/test/java/org/neo4j/driver/ParametersTest.java +++ b/driver/src/test/java/org/neo4j/driver/ParametersTest.java @@ -22,7 +22,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.Values; +import org.neo4j.driver.v1.exceptions.ClientException; public class ParametersTest { diff --git a/driver/src/test/java/org/neo4j/driver/StatementTest.java b/driver/src/test/java/org/neo4j/driver/StatementTest.java index 15fcca8f75..bb9eef0b98 100644 --- a/driver/src/test/java/org/neo4j/driver/StatementTest.java +++ b/driver/src/test/java/org/neo4j/driver/StatementTest.java @@ -18,15 +18,17 @@ */ package org.neo4j.driver; +import org.junit.Test; + import java.util.Map; -import org.junit.Test; +import org.neo4j.driver.v1.Statement; +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.internal.ParameterSupport.NO_PARAMETERS; +import static org.neo4j.driver.v1.Values.parameters; public class StatementTest { @@ -106,7 +108,7 @@ public void shouldUpdateStatementParameters() { // when String text = "MATCH (n) RETURN n"; - Map initialParameters = parameters( "a", 1, "b", 2, "c", 3 ); + Map initialParameters = parameters( "a", 1, "b", 2, "c", 3 ); Statement statement = new Statement( "MATCH (n) RETURN n", initialParameters ) .withUpdatedParameters( parameters( "a", 0, "b", null ) ); diff --git a/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java b/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java index 51c2af932d..7e623fa8d8 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ConnectionPoolIT.java @@ -18,24 +18,24 @@ */ package org.neo4j.driver.integration; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.neo4j.driver.Driver; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + 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 org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.DatabaseException; 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/integration/EntityTypeIT.java index 8b0ad5bdfc..9264feb961 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/EntityTypeIT.java @@ -21,9 +21,9 @@ 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.v1.Node; +import org.neo4j.driver.v1.Path; +import org.neo4j.driver.v1.Relationship; import org.neo4j.driver.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/integration/ErrorIT.java index 7777c8191e..2f1c51b637 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java @@ -22,10 +22,10 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.driver.Driver; +import org.neo4j.driver.v1.Driver; import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.Transaction; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.util.TestNeo4jSession; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java b/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java index 167f57df6c..1b2246b2e6 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/LoadCSVIT.java @@ -23,17 +23,17 @@ import java.io.IOException; -import org.neo4j.driver.Driver; +import org.neo4j.driver.v1.Driver; import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Result; -import org.neo4j.driver.Session; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Session; import org.neo4j.driver.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/integration/LoggingIT.java index 9904a7f20d..1e6fc29517 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/LoggingIT.java @@ -24,11 +24,11 @@ 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.v1.Config; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.logging.Logger; +import org.neo4j.driver.v1.logging.Logging; import org.neo4j.driver.util.Neo4jRunner; import org.neo4j.driver.util.TestNeo4j; diff --git a/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java b/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java index 48daff89ac..46a020e34f 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java @@ -22,15 +22,15 @@ 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.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.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/integration/ResultStreamIT.java index 3ba100ca5b..efa534ea2f 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ResultStreamIT.java @@ -21,15 +21,15 @@ 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.v1.Result; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.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/integration/SSLSocketChannelIT.java index 55af1ac6af..1ae738874e 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SSLSocketChannelIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SSLSocketChannelIT.java @@ -18,6 +18,9 @@ */ package org.neo4j.driver.integration; +import org.junit.Rule; +import org.junit.Test; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -31,19 +34,15 @@ import javax.net.ssl.SSLHandshakeException; import javax.xml.bind.DatatypeConverter; -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.Result; +import org.neo4j.driver.v1.logging.Logger; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; @@ -53,12 +52,11 @@ import static org.mockito.Mockito.atLeastOnce; 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.Config.TLSConfig.usingKnownCerts; +import static org.neo4j.driver.v1.Config.TLSConfig.usingTrustedCert; public class SSLSocketChannelIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java b/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java index 4d125fc1ff..2d36e9dde4 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ScalarTypeIT.java @@ -27,15 +27,15 @@ 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.v1.Value; +import org.neo4j.driver.v1.values.ListValue; +import org.neo4j.driver.v1.values.MapValue; import org.neo4j.driver.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.Values.value; +import static org.neo4j.driver.v1.Values.parameters; +import static org.neo4j.driver.v1.Values.value; @RunWith(Parameterized.class) public class ScalarTypeIT diff --git a/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java b/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java index 26b718a754..e33e5d6f14 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ServerKilledIT.java @@ -22,9 +22,9 @@ 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.v1.Driver; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.util.Neo4jRunner; import org.neo4j.driver.util.TestNeo4j; diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java index 629582a5f7..e7dade3eab 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java @@ -21,9 +21,9 @@ import org.junit.Rule; import org.junit.Test; -import org.neo4j.driver.Driver; +import org.neo4j.driver.v1.Driver; import org.neo4j.driver.GraphDatabase; -import org.neo4j.driver.Session; +import org.neo4j.driver.v1.Session; import org.neo4j.driver.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/integration/StatementIT.java index 06c4aa04ac..106621942f 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/StatementIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/StatementIT.java @@ -21,17 +21,17 @@ 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.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.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/integration/SummaryIT.java index 788cee1b37..da6c07bad9 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java @@ -24,13 +24,13 @@ 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.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.util.TestNeo4jSession; import static org.hamcrest.Matchers.equalTo; @@ -41,10 +41,10 @@ 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; +import static org.neo4j.driver.v1.StatementType.READ_ONLY; +import static org.neo4j.driver.v1.StatementType.READ_WRITE; +import static org.neo4j.driver.v1.StatementType.SCHEMA_WRITE; +import static org.neo4j.driver.v1.StatementType.WRITE_ONLY; public class SummaryIT { diff --git a/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java index 4c45aeed6a..2ee06b262d 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/TransactionIT.java @@ -22,9 +22,9 @@ 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.v1.Result; +import org.neo4j.driver.v1.Transaction; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.util.TestNeo4jSession; import static junit.framework.Assert.assertTrue; diff --git a/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java b/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java index 4890a8d5c5..176492a5d3 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/ConfigTest.java @@ -22,14 +22,14 @@ import java.io.File; -import org.neo4j.driver.Config; -import org.neo4j.driver.Config.TlsAuthenticationConfig; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.Config.TLSConfig; 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; +import static org.neo4j.driver.v1.Config.TLSConfig.usingKnownCerts; +import static org.neo4j.driver.v1.Config.TLSConfig.usingTrustedCert; public class ConfigTest { @@ -42,7 +42,7 @@ public void shouldDefaultToKnownCerts() Config config = Config.defaultConfig(); // When - TlsAuthenticationConfig authConfig = config.tlsAuthConfig(); + TLSConfig authConfig = config.tlsAuthConfig(); // Then assertFalse( authConfig.isFullAuthEnabled() ); @@ -57,7 +57,7 @@ public void shouldChangeToNewKnownCerts() Config config = Config.build().withTlsAuthConfig( usingKnownCerts( knownCerts ) ).toConfig(); // When - TlsAuthenticationConfig authConfig = config.tlsAuthConfig(); + TLSConfig authConfig = config.tlsAuthConfig(); // Then assertFalse( authConfig.isFullAuthEnabled() ); @@ -72,7 +72,7 @@ public void shouldChangeToTrustedCert() Config config = Config.build().withTlsAuthConfig( usingTrustedCert( trustedCert ) ).toConfig(); // When - TlsAuthenticationConfig authConfig = config.tlsAuthConfig(); + TLSConfig 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/internal/SelfContainedNodeTest.java index 163510dda7..5f26150205 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SelfContainedNodeTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/SelfContainedNodeTest.java @@ -22,14 +22,14 @@ import java.util.List; -import org.neo4j.driver.Node; +import org.neo4j.driver.v1.Node; import org.neo4j.driver.internal.util.Iterables; -import org.neo4j.driver.Values; +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 { diff --git a/driver/src/test/java/org/neo4j/driver/internal/SimpleIdentityTest.java b/driver/src/test/java/org/neo4j/driver/internal/SimpleIdentityTest.java index 0dc88c91a8..ac77629e7f 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SimpleIdentityTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/SimpleIdentityTest.java @@ -20,7 +20,7 @@ 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; diff --git a/driver/src/test/java/org/neo4j/driver/internal/SimplePathTest.java b/driver/src/test/java/org/neo4j/driver/internal/SimplePathTest.java index 4b9c8ca3d8..d7a404a598 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SimplePathTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/SimplePathTest.java @@ -25,9 +25,9 @@ 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.v1.Node; +import org.neo4j.driver.v1.Path; +import org.neo4j.driver.v1.Relationship; import org.neo4j.driver.util.Lists; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/driver/src/test/java/org/neo4j/driver/internal/StandardSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/StandardSessionTest.java index 718c7399e8..c7877aa457 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/StandardSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/StandardSessionTest.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.Transaction; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.internal.spi.Connection; import static junit.framework.TestCase.assertNotNull; diff --git a/driver/src/test/java/org/neo4j/driver/internal/SummaryBuilderTest.java b/driver/src/test/java/org/neo4j/driver/internal/SummaryBuilderTest.java index b320d70910..aea88fce56 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/SummaryBuilderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/SummaryBuilderTest.java @@ -20,9 +20,9 @@ import org.junit.Test; -import org.neo4j.driver.ResultSummary; -import org.neo4j.driver.Statement; -import org.neo4j.driver.UpdateStatistics; +import org.neo4j.driver.v1.ResultSummary; +import org.neo4j.driver.v1.Statement; +import org.neo4j.driver.v1.UpdateStatistics; import org.neo4j.driver.internal.summary.SimpleUpdateStatistics; import org.neo4j.driver.internal.summary.SummaryBuilder; diff --git a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java b/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java index b2f7cc0b4f..c9e3df4fab 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java @@ -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.values.ListValue; +import org.neo4j.driver.v1.values.MapValue; +import org.neo4j.driver.v1.values.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/internal/connector/socket/ChunkedInputTest.java index ed98e22223..c98591761a 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/ChunkedInputTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/connector/socket/ChunkedInputTest.java @@ -31,7 +31,7 @@ import java.nio.channels.ReadableByteChannel; import java.util.Arrays; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.util.RecordingByteChannel; import static junit.framework.Assert.fail; diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java index 04d9105496..8356c443ea 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java @@ -22,8 +22,8 @@ import java.util.HashMap; -import org.neo4j.driver.Value; -import org.neo4j.driver.internal.logging.DevNullLogger; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.logging.DevNullLogger; import org.neo4j.driver.internal.messaging.AckFailureMessage; import org.neo4j.driver.internal.messaging.DiscardAllMessage; import org.neo4j.driver.internal.messaging.FailureMessage; @@ -37,7 +37,7 @@ import org.neo4j.driver.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/internal/connector/socket/SSLSocketChannelTest.java index 9d7476181d..a857f4f136 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannelTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SSLSocketChannelTest.java @@ -29,7 +29,7 @@ import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLSession; -import org.neo4j.driver.internal.spi.Logger; +import org.neo4j.driver.v1.logging.Logger; import org.neo4j.driver.internal.util.BytePrinter; import static javax.net.ssl.SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING; diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketClientTest.java b/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketClientTest.java index 76c1f2fdef..62c2a01ba1 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketClientTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketClientTest.java @@ -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.logging.DevNullLogger; public class SocketClientTest { diff --git a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandlerTest.java b/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandlerTest.java index 25f2c73158..b944d779b9 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandlerTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/connector/socket/SocketResponseHandlerTest.java @@ -24,10 +24,10 @@ 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.v1.Plan; +import org.neo4j.driver.v1.StatementType; +import org.neo4j.driver.v1.UpdateStatistics; +import org.neo4j.driver.v1.Value; import org.neo4j.driver.internal.spi.StreamCollector; import org.neo4j.driver.internal.summary.SimpleUpdateStatistics; @@ -37,9 +37,9 @@ 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.v1.Values.parameters; +import static org.neo4j.driver.v1.Values.value; +import static org.neo4j.driver.v1.Values.values; import static org.neo4j.driver.internal.summary.SimplePlan.plan; public class SocketResponseHandlerTest diff --git a/driver/src/test/java/org/neo4j/driver/internal/logging/ConsoleLoggingTest.java b/driver/src/test/java/org/neo4j/driver/internal/logging/ConsoleLoggingTest.java index 5cce8ae097..0a0a51acaa 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/logging/ConsoleLoggingTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/logging/ConsoleLoggingTest.java @@ -29,8 +29,9 @@ 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.logging.ConsoleLogging; +import org.neo4j.driver.v1.logging.ConsoleLogging.ConsoleLogger; +import org.neo4j.driver.v1.logging.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/internal/messaging/MessageFormatTest.java index cfda5643ca..0d9b89fe05 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/messaging/MessageFormatTest.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.HashMap; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; import org.neo4j.driver.internal.SimpleNode; import org.neo4j.driver.internal.SimplePath; import org.neo4j.driver.internal.SimpleRelationship; @@ -43,8 +43,8 @@ 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/pool/ConnectionInvalidationTest.java b/driver/src/test/java/org/neo4j/driver/internal/pool/ConnectionInvalidationTest.java index d8aeb88647..aa95ca9d74 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/pool/ConnectionInvalidationTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/pool/ConnectionInvalidationTest.java @@ -22,9 +22,9 @@ 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.v1.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.Neo4jException; +import org.neo4j.driver.v1.exceptions.TransientException; import org.neo4j.driver.internal.spi.Connection; import static junit.framework.TestCase.assertFalse; @@ -34,7 +34,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 { diff --git a/driver/src/test/java/org/neo4j/driver/internal/pool/StandardConnectionPoolTest.java b/driver/src/test/java/org/neo4j/driver/internal/pool/StandardConnectionPoolTest.java index 8ed104a610..5329ad7638 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/pool/StandardConnectionPoolTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/pool/StandardConnectionPoolTest.java @@ -24,8 +24,8 @@ import java.net.URI; -import org.neo4j.driver.Config; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.internal.spi.Connection; import org.neo4j.driver.internal.spi.Connector; import org.neo4j.driver.internal.util.Clock; diff --git a/driver/src/test/java/org/neo4j/driver/internal/pool/ThreadCachingPoolTest.java b/driver/src/test/java/org/neo4j/driver/internal/pool/ThreadCachingPoolTest.java index 632f8bbe1d..07583d6977 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/pool/ThreadCachingPoolTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/pool/ThreadCachingPoolTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.neo4j.driver.exceptions.ClientException; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.internal.util.Consumer; import static junit.framework.TestCase.fail; diff --git a/driver/src/test/java/org/neo4j/driver/internal/summary/ResultBuilderTest.java b/driver/src/test/java/org/neo4j/driver/internal/summary/ResultBuilderTest.java index 6443f6d312..80c41dbd9b 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/summary/ResultBuilderTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/summary/ResultBuilderTest.java @@ -22,15 +22,15 @@ 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.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.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/internal/summary/SimplePlanTest.java index 1a4660edf5..735bdd8fd0 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/summary/SimplePlanTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/summary/SimplePlanTest.java @@ -23,14 +23,14 @@ 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/internal/value/BooleanValueTest.java index 2f6e7c87d5..4f9c996415 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/BooleanValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/BooleanValueTest.java @@ -20,6 +20,8 @@ import org.junit.Test; +import org.neo4j.driver.v1.values.BooleanValue; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java index 21c6ab8925..f2fa968d01 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/FloatValueTest.java @@ -20,6 +20,8 @@ import org.junit.Test; +import org.neo4j.driver.v1.values.FloatValue; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/IdentityValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/IdentityValueTest.java index 1ec7ba19f5..1cc219665f 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/IdentityValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/IdentityValueTest.java @@ -20,7 +20,8 @@ import org.junit.Test; -import org.neo4j.driver.Identity; +import org.neo4j.driver.v1.Identity; +import org.neo4j.driver.v1.values.IdentityValue; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java index 59cd0d71f8..2946022d8f 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/IntegerValueTest.java @@ -20,6 +20,8 @@ import org.junit.Test; +import org.neo4j.driver.v1.values.IntegerValue; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java index 3907236a4c..16f0ee2e6e 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/NodeValueTest.java @@ -22,8 +22,9 @@ import java.util.HashMap; -import org.neo4j.driver.Value; +import org.neo4j.driver.v1.Value; import org.neo4j.driver.internal.SimpleNode; +import org.neo4j.driver.v1.values.NodeValue; 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/internal/value/RelationshipValueTest.java index 66b1377320..9a70a01763 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/RelationshipValueTest.java @@ -21,6 +21,7 @@ import org.junit.Test; import org.neo4j.driver.internal.SimpleRelationship; +import org.neo4j.driver.v1.values.RelationshipValue; 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/internal/value/StringValueTest.java index ee7cb7f545..b036b1be88 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java @@ -20,6 +20,8 @@ import org.junit.Test; +import org.neo4j.driver.v1.values.StringValue; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; diff --git a/driver/src/test/java/org/neo4j/driver/stress/DriverStresser.java b/driver/src/test/java/org/neo4j/driver/stress/DriverStresser.java index f3c5fe8a83..f0a7fd43b2 100644 --- a/driver/src/test/java/org/neo4j/driver/stress/DriverStresser.java +++ b/driver/src/test/java/org/neo4j/driver/stress/DriverStresser.java @@ -28,13 +28,13 @@ 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.v1.Driver; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Session; +import org.neo4j.driver.v1.Value; import org.neo4j.driver.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/DumpMessage.java b/driver/src/test/java/org/neo4j/driver/util/DumpMessage.java index 44ee52b159..fcf93f34f2 100644 --- a/driver/src/test/java/org/neo4j/driver/util/DumpMessage.java +++ b/driver/src/test/java/org/neo4j/driver/util/DumpMessage.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import org.neo4j.driver.Value; -import org.neo4j.driver.exceptions.Neo4jException; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.exceptions.Neo4jException; import org.neo4j.driver.internal.connector.socket.ChunkedInput; import org.neo4j.driver.internal.messaging.AckFailureMessage; import org.neo4j.driver.internal.messaging.DiscardAllMessage; diff --git a/driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java b/driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java index 5f41cfecbb..e41999edbe 100644 --- a/driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java +++ b/driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java @@ -23,11 +23,12 @@ 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.StandardDriverV1; +import org.neo4j.driver.v1.Config; +import org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.internal.connector.socket.SocketClient; -import org.neo4j.driver.internal.logging.DevNullLogger; +import org.neo4j.driver.v1.logging.DevNullLogger; import org.neo4j.driver.util.Neo4jInstaller.Neo4jInstallerFactory; import static java.lang.String.format; @@ -304,7 +305,7 @@ private void resetDriver() throws Exception try { debug( "Resetting driver" ); - currentDriver = new Driver( serverURI(), serverConfig() ); + currentDriver = new StandardDriverV1( serverURI(), serverConfig() ); staleDriver = false; } finally diff --git a/driver/src/test/java/org/neo4j/driver/util/TestNeo4j.java b/driver/src/test/java/org/neo4j/driver/util/TestNeo4j.java index 94cb51555d..38ae139a12 100644 --- a/driver/src/test/java/org/neo4j/driver/util/TestNeo4j.java +++ b/driver/src/test/java/org/neo4j/driver/util/TestNeo4j.java @@ -27,9 +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 org.neo4j.driver.v1.Driver; +import org.neo4j.driver.v1.Result; +import org.neo4j.driver.v1.Session; import static org.neo4j.driver.util.Neo4jResetMode.CLEAR_DATABASE_CONTENTS; import static org.neo4j.driver.util.Neo4jRunner.DEFAULT_URL; diff --git a/driver/src/test/java/org/neo4j/driver/util/TestNeo4jSession.java b/driver/src/test/java/org/neo4j/driver/util/TestNeo4jSession.java index 919a20343c..c2991603c8 100644 --- a/driver/src/test/java/org/neo4j/driver/util/TestNeo4jSession.java +++ b/driver/src/test/java/org/neo4j/driver/util/TestNeo4jSession.java @@ -23,10 +23,10 @@ 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() ); } 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..2ba2eda8ab 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; @@ -39,7 +39,7 @@ public class DriverDocIT @Rule public TestNeo4jSession session = new TestNeo4jSession(); - /** @see Driver */ + /** @see org.neo4j.driver.v1.Driver */ public void exampleUsage( DocSnippet snippet ) { // given 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 92% 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..3260790b55 100644 --- a/driver/src/test/java/org/neo4j/driver/ResultDocIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/ResultDocIT.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; @@ -24,6 +24,7 @@ import org.junit.runner.RunWith; import org.neo4j.driver.util.TestNeo4jSession; +import org.neo4j.driver.v1.ResultSummary; import static org.junit.Assert.assertTrue; @@ -33,7 +34,7 @@ public class ResultDocIT @Rule public TestNeo4jSession session = new TestNeo4jSession(); - /** @see Result */ + /** @see org.neo4j.driver.v1.Result */ public void summarizeUsage( DocSnippet snippet ) { // Given 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 98% 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..2c7a388901 100644 --- a/driver/src/test/java/org/neo4j/driver/StatementRunnerDocIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/StatementRunnerDocIT.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; 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 98% 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..93d6b5d699 100644 --- a/driver/src/test/java/org/neo4j/driver/TransactionDocIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/TransactionDocIT.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; 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 90% 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..4db9ce1846 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; @@ -25,16 +25,19 @@ import java.util.LinkedList; import java.util.List; +import org.neo4j.driver.v1.Value; +import org.neo4j.driver.v1.Values; + 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 { private final Value exampleValue = Values.value( - parameters( "users", asList( parameters( "name", "Anders" ), parameters( "name", "John" ) ) )); + parameters( "users", asList( parameters( "name", "Anders" ), parameters( "name", "John" ) ) ) ); public void classDocTreeExample( DocSnippet snippet ) { diff --git a/pom.xml b/pom.xml index c011d10e51..ea5cb307e3 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ https://github.com/neo4j/neo4j-java-driver + api-v1 driver