diff --git a/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java b/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java index d6b1515b4b..11925ce3c9 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java +++ b/driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java @@ -221,6 +221,7 @@ private static SecurityPlan createSecurityPlan( BoltServerAddress address, Confi * Establish a complete SecurityPlan based on the details provided for * driver construction. */ + @SuppressWarnings( "deprecation" ) private static SecurityPlan createSecurityPlanImpl( BoltServerAddress address, Config config ) throws GeneralSecurityException, IOException { diff --git a/driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java b/driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java index d653fb3c33..0a06d6a013 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java +++ b/driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java @@ -52,7 +52,7 @@ public class NetworkSession implements Session, SessionResourcesHandler private final RetryLogic retryLogic; protected final Logger logger; - private String lastBookmark; + private String bookmark; private PooledConnection currentConnection; private ExplicitTransaction currentTransaction; @@ -116,6 +116,7 @@ public static StatementResult run( Connection connection, Statement statement, return result; } + @Deprecated @Override public synchronized void reset() { @@ -174,10 +175,14 @@ public synchronized Transaction beginTransaction() return beginTransaction( mode ); } + @Deprecated @Override public synchronized Transaction beginTransaction( String bookmark ) { - lastBookmark = bookmark; + if ( bookmark != null ) + { + setBookmark( bookmark ); + } return beginTransaction(); } @@ -193,15 +198,18 @@ public T writeTransaction( TransactionWork work ) return transaction( AccessMode.WRITE, work ); } - void setLastBookmark( String bookmark ) + // Internal method for setting the bookmark explicitly, mainly for testing. + // This method does not prevent setting the bookmark to null since that + // is a valid requirement for some test scenarios. + void setBookmark( String bookmark ) { - lastBookmark = bookmark; + this.bookmark = bookmark; } @Override public String lastBookmark() { - return lastBookmark; + return bookmark; } @Override @@ -294,7 +302,7 @@ private synchronized Transaction beginTransaction( AccessMode mode ) syncAndCloseCurrentConnection(); currentConnection = acquireConnection( mode ); - currentTransaction = new ExplicitTransaction( currentConnection, this, lastBookmark ); + currentTransaction = new ExplicitTransaction( currentConnection, this, bookmark); currentConnection.setResourcesHandler( this ); return currentTransaction; } @@ -391,7 +399,7 @@ private void updateLastBookmarkFrom( ExplicitTransaction tx ) { if ( tx.bookmark() != null ) { - lastBookmark = tx.bookmark(); + bookmark = tx.bookmark(); } } diff --git a/driver/src/main/java/org/neo4j/driver/internal/SessionFactoryImpl.java b/driver/src/main/java/org/neo4j/driver/internal/SessionFactoryImpl.java index c18f1902e8..ebac2eec2f 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/SessionFactoryImpl.java +++ b/driver/src/main/java/org/neo4j/driver/internal/SessionFactoryImpl.java @@ -53,7 +53,7 @@ public Session newInstance( AccessMode mode, String bookmark ) { session = new NetworkSession( connectionProvider, mode, retryLogic, logging ); } - session.setLastBookmark( bookmark ); + session.setBookmark( bookmark ); return session; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/NetworkSessionTest.java b/driver/src/test/java/org/neo4j/driver/internal/NetworkSessionTest.java index 346df9f6e7..3e8de94430 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/NetworkSessionTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/NetworkSessionTest.java @@ -301,6 +301,7 @@ public void closesClosedConnectionUsedForRunWhenSessionIsClosed() verify( connection ).close(); } + @SuppressWarnings( "deprecation" ) @Test public void resetDoesNothingWhenNoTransactionAndNoConnection() { @@ -541,8 +542,9 @@ public void bookmarkIsPropagatedInBeginTransaction() PooledConnection connection = mock( PooledConnection.class ); when( connectionProvider.acquireConnection( READ ) ).thenReturn( connection ); NetworkSession session = newSession( connectionProvider, READ ); + session.setBookmark(bookmark); - try ( Transaction ignore = session.beginTransaction( bookmark ) ) + try ( Transaction ignore = session.beginTransaction() ) { verifyBeginTx( connection, bookmark ); } @@ -595,34 +597,34 @@ public void setLastBookmark() { NetworkSession session = newSession( mock( ConnectionProvider.class ), WRITE ); - session.setLastBookmark( "TheBookmark" ); + session.setBookmark( "TheBookmark" ); assertEquals( "TheBookmark", session.lastBookmark() ); } @Test - public void possibleToOverwriteBookmarkWithNull() + public void testPassingNoBookmarkShouldRetainBookmark() { - NetworkSession session = newSession( mock( ConnectionProvider.class ), WRITE ); - session.setLastBookmark( "TheBookmark" ); - - session.setLastBookmark( null ); - - assertNull( session.lastBookmark() ); + ConnectionProvider connectionProvider = mock( ConnectionProvider.class ); + PooledConnection connection = openConnectionMock(); + when( connectionProvider.acquireConnection( READ ) ).thenReturn( connection ); + NetworkSession session = newSession( connectionProvider, READ ); + session.setBookmark( "X" ); + session.beginTransaction(); + assertThat( session.lastBookmark(), equalTo( "X" ) ); } + @SuppressWarnings( "deprecation" ) @Test - public void allowsToStartTransactionWithNullBookmark() + public void testPassingNullBookmarkShouldRetainBookmark() { ConnectionProvider connectionProvider = mock( ConnectionProvider.class ); PooledConnection connection = openConnectionMock(); when( connectionProvider.acquireConnection( READ ) ).thenReturn( connection ); NetworkSession session = newSession( connectionProvider, READ ); - session.setLastBookmark( "SomeUndesiredBookmark" ); - + session.setBookmark( "X" ); session.beginTransaction( null ); - - assertNull( session.lastBookmark() ); + assertThat( session.lastBookmark(), equalTo( "X" ) ); } @Test @@ -1096,7 +1098,7 @@ private static NetworkSession newSession( ConnectionProvider connectionProvider, RetryLogic retryLogic, String bookmark ) { NetworkSession session = new NetworkSession( connectionProvider, mode, retryLogic, DEV_NULL_LOGGING ); - session.setLastBookmark( bookmark ); + session.setBookmark( bookmark ); return session; } diff --git a/driver/src/test/java/org/neo4j/driver/internal/RoutingDriverBoltKitTest.java b/driver/src/test/java/org/neo4j/driver/internal/RoutingDriverBoltKitTest.java index be1d6ebf8c..96b112599c 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/RoutingDriverBoltKitTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/RoutingDriverBoltKitTest.java @@ -548,9 +548,9 @@ public void shouldSendAndReceiveBookmark() throws Exception StubServer writer = StubServer.start( "write_tx_with_bookmarks.script", 9007 ); try ( Driver driver = GraphDatabase.driver( "bolt+routing://127.0.0.1:9001", config ); - Session session = driver.session() ) + Session session = driver.session( "OldBookmark" ) ) { - try ( Transaction tx = session.beginTransaction( "OldBookmark" ) ) + try ( Transaction tx = session.beginTransaction() ) { tx.run( "CREATE (n {name:'Bob'})" ); tx.success(); diff --git a/driver/src/test/java/org/neo4j/driver/internal/RoutingDriverTest.java b/driver/src/test/java/org/neo4j/driver/internal/RoutingDriverTest.java index 28ae33d3b7..01e010d04f 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/RoutingDriverTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/RoutingDriverTest.java @@ -316,6 +316,7 @@ public void shouldRoundRobinAmongWriteServers() assertNotEquals( write3.address, write1.address ); } + @SuppressWarnings( "deprecation" ) @Test public void testTrustOnFirstUseNotCompatibleWithRoutingDriver() { @@ -440,7 +441,7 @@ private static class NetworkSessionWithAddressFactory extends SessionFactoryImpl public Session newInstance( AccessMode mode, String bookmark ) { NetworkSessionWithAddress session = new NetworkSessionWithAddress( connectionProvider, mode, logging ); - session.setLastBookmark( bookmark ); + session.setBookmark( bookmark ); return session; } } diff --git a/driver/src/test/java/org/neo4j/driver/v1/ConfigTest.java b/driver/src/test/java/org/neo4j/driver/v1/ConfigTest.java index a829a2c13e..52bd286bd9 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/ConfigTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/ConfigTest.java @@ -51,6 +51,7 @@ public void shouldDefaultToKnownCerts() assertEquals( authConfig.strategy(), Config.TrustStrategy.Strategy.TRUST_ALL_CERTIFICATES ); } + @SuppressWarnings( "deprecation" ) @Test public void shouldChangeToNewKnownCerts() { diff --git a/driver/src/test/java/org/neo4j/driver/v1/GraphDatabaseTest.java b/driver/src/test/java/org/neo4j/driver/v1/GraphDatabaseTest.java index 3a1d43562c..9a0afe2634 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/GraphDatabaseTest.java +++ b/driver/src/test/java/org/neo4j/driver/v1/GraphDatabaseTest.java @@ -69,6 +69,7 @@ public void boltPlusDiscoverySchemeShouldInstantiateClusterDriver() throws Excep assertThat( server.exitStatus(), equalTo( 0 ) ); } + @SuppressWarnings( "deprecation" ) @Test public void boltPlusDiscoverySchemeShouldNotSupportTrustOnFirstUse() { diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/BookmarkIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/BookmarkIT.java index 2ccef793de..d27a1a5859 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/integration/BookmarkIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/BookmarkIT.java @@ -103,17 +103,20 @@ public void shouldThrowForInvalidBookmark() { String invalidBookmark = "hi, this is an invalid bookmark"; - try - { - session.beginTransaction( invalidBookmark ); - fail( "Exception expected" ); - } - catch ( Exception e ) - { - assertThat( e, instanceOf( ClientException.class ) ); + try (Session session = driver.session( invalidBookmark )) { + try + { + session.beginTransaction(); + fail( "Exception expected" ); + } + catch ( Exception e ) + { + assertThat( e, instanceOf( ClientException.class ) ); + } } } + @SuppressWarnings( "deprecation" ) @Test public void shouldThrowForUnreachableBookmark() { diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java index caf910c634..bb631b5e74 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java @@ -135,8 +135,8 @@ public String apply( Session session ) assertNotNull( bookmark ); - try ( Session session = driver.session(); - Transaction tx = session.beginTransaction( bookmark ) ) + try ( Session session = driver.session( bookmark ); + Transaction tx = session.beginTransaction() ) { Record record = tx.run( "MATCH (n:Person) RETURN COUNT(*) AS count" ).next(); assertEquals( 1, record.get( "count" ).asInt() ); @@ -153,7 +153,7 @@ public void shouldUseBookmarkFromAReadSessionInAWriteSession() throws Exception try ( Driver driver = createDriver( leader.getBoltUri() ) ) { - inExpirableSession( driver, createWritableSession(), new Function() + inExpirableSession( driver, createWritableSession( null ), new Function() { @Override public Void apply( Session session ) @@ -177,12 +177,12 @@ public Void apply( Session session ) assertNotNull( bookmark ); - inExpirableSession( driver, createWritableSession(), new Function() + inExpirableSession( driver, createWritableSession( bookmark ), new Function() { @Override public Void apply( Session session ) { - try ( Transaction tx = session.beginTransaction( bookmark ) ) + try ( Transaction tx = session.beginTransaction() ) { tx.run( "CREATE (p:Person {name: {name} })", Values.parameters( "name", "Alistair" ) ); tx.success(); @@ -249,11 +249,11 @@ public void beginTransactionThrowsForInvalidBookmark() ClusterMember leader = clusterRule.getCluster().leader(); try ( Driver driver = createDriver( leader.getBoltUri() ); - Session session = driver.session() ) + Session session = driver.session( invalidBookmark ) ) { try { - session.beginTransaction( invalidBookmark ); + session.beginTransaction(); fail( "Exception expected" ); } catch ( Exception e ) @@ -264,6 +264,7 @@ public void beginTransactionThrowsForInvalidBookmark() } } + @SuppressWarnings( "deprecation" ) @Test public void beginTransactionThrowsForUnreachableBookmark() { @@ -332,8 +333,8 @@ public String apply( Session session ) } } ); - try ( Session session2 = driver.session( AccessMode.READ ); - Transaction tx2 = session2.beginTransaction( bookmark ) ) + try ( Session session2 = driver.session( AccessMode.READ, bookmark ); + Transaction tx2 = session2.beginTransaction() ) { Record record = tx2.run( "MATCH (n:Person) RETURN COUNT(*) AS count" ).next(); tx2.success(); @@ -346,7 +347,7 @@ private int executeWriteAndReadThroughBolt( ClusterMember member ) throws Timeou { try ( Driver driver = createDriver( member.getRoutingUri() ) ) { - return inExpirableSession( driver, createWritableSession(), executeWriteAndRead() ); + return inExpirableSession( driver, createWritableSession( null ), executeWriteAndRead() ); } } @@ -362,14 +363,14 @@ public Session apply( Driver driver ) }; } - private Function createWritableSession() + private Function createWritableSession( final String bookmark ) { return new Function() { @Override public Session apply( Driver driver ) { - return driver.session( AccessMode.WRITE ); + return driver.session( AccessMode.WRITE, bookmark ); } }; } diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java index 90d770676f..4cceeea46a 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java @@ -220,6 +220,7 @@ public void shouldKillLongStreamingResult() throws Throwable } } + @SuppressWarnings( "deprecation" ) @Test public void shouldNotAllowBeginTxIfResetFailureIsNotConsumed() throws Throwable { @@ -246,6 +247,7 @@ public void shouldNotAllowBeginTxIfResetFailureIsNotConsumed() throws Throwable } } + @SuppressWarnings( "deprecation" ) @Test public void shouldThrowExceptionOnCloseIfResetFailureIsNotConsumed() throws Throwable { @@ -267,6 +269,7 @@ public void shouldThrowExceptionOnCloseIfResetFailureIsNotConsumed() throws Thro session.close(); } + @SuppressWarnings( "deprecation" ) @Test public void shouldBeAbleToBeginTxAfterResetFailureIsConsumed() throws Throwable { @@ -310,6 +313,7 @@ public void shouldBeAbleToBeginTxAfterResetFailureIsConsumed() throws Throwable } } + @SuppressWarnings( "deprecation" ) private void resetSessionAfterTimeout( final Session session, final int timeout ) { new Thread( new Runnable() @@ -333,6 +337,7 @@ public void run() } ).start(); } + @SuppressWarnings( "deprecation" ) @Test public void shouldAllowMoreStatementAfterSessionReset() { @@ -351,6 +356,7 @@ public void shouldAllowMoreStatementAfterSessionReset() } } + @SuppressWarnings( "deprecation" ) @Test public void shouldAllowMoreTxAfterSessionReset() { @@ -376,6 +382,7 @@ public void shouldAllowMoreTxAfterSessionReset() } } + @SuppressWarnings( "deprecation" ) @Test public void shouldMarkTxAsFailedAndDisallowRunAfterSessionReset() { @@ -398,6 +405,7 @@ public void shouldMarkTxAsFailedAndDisallowRunAfterSessionReset() } } + @SuppressWarnings( "deprecation" ) @Test public void shouldAllowMoreTxAfterSessionResetInTx() { diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/TLSSocketChannelIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/TLSSocketChannelIT.java index 089d16dbd9..3ce12b4e39 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/integration/TLSSocketChannelIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/TLSSocketChannelIT.java @@ -177,6 +177,7 @@ public void shouldNotPerformTLSHandshakeWithNonSystemCert() throws Throwable } } + @SuppressWarnings( "deprecation" ) @Test public void shouldFailTLSHandshakeDueToWrongCertInKnownCertsFile() throws Throwable { @@ -308,6 +309,7 @@ public void shouldEstablishTLSConnection() throws Throwable } } + @SuppressWarnings( "deprecation" ) @Test public void shouldWarnIfUsingDeprecatedTLSOption() throws Throwable { @@ -339,6 +341,7 @@ public void shouldWarnIfUsingDeprecatedTLSOption() throws Throwable "`TRUST_CUSTOM_CA_SIGNED_CERTIFICATES` instead." ); } + @SuppressWarnings( "deprecation" ) private void performTLSHandshakeUsingKnownCerts( File knownCerts ) throws Throwable { // Given diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java index fd84e1542f..5bedf082ee 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/integration/TransactionIT.java @@ -217,6 +217,7 @@ public void shouldHandleNullMapParameters() throws Throwable // Then it wasn't the end of the world as we know it } + @SuppressWarnings( "deprecation" ) @Test public void shouldBeAbleToRunMoreStatementsAfterResetOnNoErrorState() throws Throwable { @@ -235,6 +236,7 @@ public void shouldBeAbleToRunMoreStatementsAfterResetOnNoErrorState() throws Thr assertThat( nodes, equalTo( 1L ) ); } + @SuppressWarnings( "deprecation" ) @Test public void shouldHandleResetBeforeRun() throws Throwable { @@ -250,6 +252,8 @@ public void shouldHandleResetBeforeRun() throws Throwable } private Transaction globalTx = null; + + @SuppressWarnings( "deprecation" ) @Test public void shouldHandleResetFromMultipleThreads() throws Throwable { diff --git a/driver/src/test/java/org/neo4j/driver/v1/stress/SessionPoolingStressIT.java b/driver/src/test/java/org/neo4j/driver/v1/stress/SessionPoolingStressIT.java index 39a7c66122..fb2de1f55c 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/stress/SessionPoolingStressIT.java +++ b/driver/src/test/java/org/neo4j/driver/v1/stress/SessionPoolingStressIT.java @@ -81,7 +81,6 @@ public void shouldWorkFine() throws Throwable { Config config = Config.build() .withEncryptionLevel( Config.EncryptionLevel.NONE ) - .withMaxSessions( N_THREADS ) .toConfig(); driver = driver( neo4j.uri(), config ); diff --git a/driver/src/test/java/org/neo4j/driver/v1/tck/DriverSecurityComplianceSteps.java b/driver/src/test/java/org/neo4j/driver/v1/tck/DriverSecurityComplianceSteps.java index 7f4f69c6eb..c3f72df5af 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/tck/DriverSecurityComplianceSteps.java +++ b/driver/src/test/java/org/neo4j/driver/v1/tck/DriverSecurityComplianceSteps.java @@ -39,10 +39,10 @@ import org.neo4j.driver.v1.util.Neo4jRunner; import static java.io.File.createTempFile; -import static junit.framework.Assert.assertEquals; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.notNullValue; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.neo4j.driver.internal.util.CertificateTool.saveX509Cert; import static org.neo4j.driver.v1.Config.TrustStrategy.trustCustomCertificateSignedBy; @@ -65,6 +65,7 @@ public void aRunningDatabase() throws Throwable { } + @SuppressWarnings( "deprecation" ) @When( "I connect via a TLS-enabled transport for the first time for the given hostname and port$" ) public void firstUseConnect() throws Throwable { @@ -94,6 +95,7 @@ public void aRunningNeoJDatabaseThatIHaveConnectedTo() throws Throwable sessionsShouldSimplyWork(); } + @SuppressWarnings( "deprecation" ) @When( "^I connect via a TLS-enabled transport again$" ) public void iConnectViaATlsEnabledTransportAgain() throws Throwable { @@ -154,6 +156,7 @@ public void iShouldGetAHelpfulErrorExplainingThatCertificateChanged( String str @Given( "^two drivers" ) public void twoDrivers() {} + @SuppressWarnings( "deprecation" ) @When("^I configure one of them to use a different location for its known hosts storage$") public void twoDriversWithDifferentKnownHostsFiles() throws Throwable { diff --git a/driver/src/test/java/org/neo4j/driver/v1/tck/ErrorReportingSteps.java b/driver/src/test/java/org/neo4j/driver/v1/tck/ErrorReportingSteps.java index 9a4b95e240..7ca6b62c96 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/tck/ErrorReportingSteps.java +++ b/driver/src/test/java/org/neo4j/driver/v1/tck/ErrorReportingSteps.java @@ -36,10 +36,10 @@ import org.neo4j.driver.v1.exceptions.ClientException; import org.neo4j.driver.v1.exceptions.ServiceUnavailableException; -import static junit.framework.Assert.assertNull; -import static junit.framework.TestCase.assertNotNull; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.neo4j.driver.v1.tck.Environment.driver; @@ -225,6 +225,7 @@ public void iSetUpADriverToAnIncorrectScheme() throws Throwable } } + @SuppressWarnings( "deprecation" ) @Given( "^I have a driver with fixed pool size of (\\d+)$" ) public void iHaveADriverWithFixedPoolSizeOf( int poolSize ) throws Throwable { diff --git a/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java b/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java index 10f2f899b2..42947e0463 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java +++ b/driver/src/test/java/org/neo4j/driver/v1/util/TestNeo4jSession.java @@ -101,6 +101,7 @@ public Transaction beginTransaction() return realSession.beginTransaction(); } + @Deprecated @Override public Transaction beginTransaction( String bookmark ) { @@ -125,6 +126,7 @@ public String lastBookmark() return realSession.lastBookmark(); } + @Deprecated @Override public void reset() { diff --git a/examples/src/main/java/org/neo4j/docs/driver/Examples.java b/examples/src/main/java/org/neo4j/docs/driver/Examples.java index 84f7761ae4..81c2a1df38 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/Examples.java +++ b/examples/src/main/java/org/neo4j/docs/driver/Examples.java @@ -53,7 +53,7 @@ public static Driver configuration() throws Exception Driver driver = GraphDatabase.driver( "bolt://localhost:7687", AuthTokens.basic( "neo4j", "neo4j" ), - Config.build().withMaxSessions( 10 ).toConfig() ); + Config.build().toConfig() ); // end::configuration[] return driver; @@ -264,6 +264,7 @@ public static Driver requireEncryption() throws Exception return driver; } + // TODO: remove this example now that TOFU is deprecated public static Driver trustOnFirstUse() throws Exception { // tag::tls-trust-on-first-use[]