Repository: neo4j-contrib/neo4j-jdbc
Pull request #462 (2023-08-21 15:33:31)

Follow up proxy removal: remove debug param and Loggable interface
Those are now unused


Patch:
diff --git a/docs/index.html b/docs/index.html
index 73492b20..40957e48 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -642,7 +642,7 @@ try (Connection connection = DriverManager.getConnection("jdbc:neo4j:bolt://loca
 </div>
 </li>
 <li>
-<p>You can also use additional parameters in the URL separated by an <code>&amp;</code> character for authentication, debug mode, SSL encryption and flattening e.g. <code>jdbc:neo4j:bolt://localhost/?user=neo4j&amp;password=xxxx&amp;debug=true&amp;nossl&amp;flatten=[-1,100,1000]</code></p>
+<p>You can also use additional parameters in the URL separated by an <code>&amp;</code> character for authentication, SSL encryption and flattening e.g. <code>jdbc:neo4j:bolt://localhost/?user=neo4j&amp;password=xxxx&amp;nossl&amp;flatten=[-1,100,1000]</code></p>
 </li>
 </ul>
 </div>
@@ -894,4 +894,4 @@ Last updated 2022-11-21 21:53:16 +0100
 </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/BoltNeo4jPreparedStatement.java b/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/BoltNeo4jPreparedStatement.java
index f48207eb..87d4c82d 100644
--- a/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/BoltNeo4jPreparedStatement.java
+++ b/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/BoltNeo4jPreparedStatement.java
@@ -21,7 +21,6 @@ package org.neo4j.jdbc.bolt;
 
 import org.neo4j.driver.Result;
 import org.neo4j.driver.summary.SummaryCounters;
-import org.neo4j.jdbc.Loggable;
 import org.neo4j.jdbc.Neo4jParameterMetaData;
 import org.neo4j.jdbc.Neo4jPreparedStatement;
 import org.neo4j.jdbc.Neo4jResultSetMetaData;
@@ -48,12 +47,12 @@ import java.util.function.Function;
 import static java.util.Arrays.copyOf;
 import static org.neo4j.jdbc.utils.BoltNeo4jUtils.executeInTx;
 
-public class BoltNeo4jPreparedStatement extends Neo4jPreparedStatement implements Loggable {
+public class BoltNeo4jPreparedStatement extends Neo4jPreparedStatement {
 
 	private final ResultSetFactory resultSetFactory;
 
 	private BoltNeo4jPreparedStatement(BoltNeo4jConnectionImpl connection, String rawStatement, int... rsParams) {
-		this(connection, (debug1, statement1, iterator, params) -> BoltNeo4jResultSet.newInstance(statement1, iterator, params), rawStatement, rsParams);
+		this(connection, BoltNeo4jResultSet::newInstance, rawStatement, rsParams);
 	}
 
 	// visible for testing
@@ -63,15 +62,13 @@ public class BoltNeo4jPreparedStatement extends Neo4jPreparedStatement implement
 		this.resultSetParams = rsParams;
 	}
 
-	public static PreparedStatement newInstance(boolean debug, BoltNeo4jConnectionImpl connection, String rawStatement, int... rsParams) {
-		Neo4jPreparedStatement ps = new BoltNeo4jPreparedStatement(connection, rawStatement, rsParams);
-		ps.setDebug(debug);
-		return ps;
+	public static PreparedStatement newInstance(BoltNeo4jConnectionImpl connection, String rawStatement, int... rsParams) {
+		return new BoltNeo4jPreparedStatement(connection, rawStatement, rsParams);
 	}
 
 	@Override public ResultSet executeQuery() throws SQLException {
 		return executeInternal((result) -> {
-			this.currentResultSet = this.resultSetFactory.create(this.hasDebug(), this, result, this.resultSetParams);
+			this.currentResultSet = this.resultSetFactory.create(this, result, this.resultSetParams);
 			this.currentUpdateCount = -1;
 			return currentResultSet;
 		});
@@ -90,7 +87,7 @@ public class BoltNeo4jPreparedStatement extends Neo4jPreparedStatement implement
 		return executeInternal((result) -> {
 			boolean hasResultSet = result.hasNext();
 			if (hasResultSet) {
-				this.currentResultSet = this.resultSetFactory.create(this.hasDebug(), this, result, this.resultSetParams);
+				this.currentResultSet = this.resultSetFactory.create(this, result, this.resultSetParams);
 				this.currentUpdateCount = -1;
 			} else {
 				this.currentResultSet = null;
diff --git a/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/BoltNeo4jStatement.java b/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/BoltNeo4jStatement.java
index a5b005ef..64a8d929 100644
--- a/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/BoltNeo4jStatement.java
+++ b/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/BoltNeo4jStatement.java
@@ -58,15 +58,13 @@ public class BoltNeo4jStatement extends Neo4jStatement {
 		this.batchStatements = new ArrayList<>();
 	}
 
-	public static Statement newInstance(boolean debug, BoltNeo4jConnectionImpl connection, int... rsParams) {
-		Neo4jStatement statement = new BoltNeo4jStatement(connection, (debug1, statement1, iterator, params) -> BoltNeo4jResultSet.newInstance(statement1, iterator, params), rsParams);
-		statement.setDebug(debug);
-		return statement;
+	public static Statement newInstance(BoltNeo4jConnectionImpl connection, int... rsParams) {
+		return new BoltNeo4jStatement(connection, BoltNeo4jResultSet::newInstance, rsParams);
 	}
 
 	@Override public ResultSet executeQuery(String sql) throws SQLException {
 		return executeInternal(sql, (result) -> {
-			this.currentResultSet = this.resultSetFactory.create(this.hasDebug(), this, result, this.resultSetParams);
+			this.currentResultSet = this.resultSetFactory.create(this, result, this.resultSetParams);
 			this.currentUpdateCount = -1;
 			return this.currentResultSet;
 		});
diff --git a/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/ResultSetFactory.java b/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/ResultSetFactory.java
index c49753d3..15666a20 100644
--- a/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/ResultSetFactory.java
+++ b/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/ResultSetFactory.java
@@ -8,5 +8,5 @@ import java.sql.Statement;
 @FunctionalInterface
 interface ResultSetFactory {
 
-    ResultSet create(boolean debug, Statement statement, Result iterator, int... params);
+    ResultSet create(Statement statement, Result iterator, int... params);
 }
diff --git a/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/impl/BoltNeo4jConnectionImpl.java b/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/impl/BoltNeo4jConnectionImpl.java
index 6589f339..3879423f 100644
--- a/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/impl/BoltNeo4jConnectionImpl.java
+++ b/neo4j-jdbc-bolt/src/main/java/org/neo4j/jdbc/bolt/impl/BoltNeo4jConnectionImpl.java
@@ -239,7 +239,7 @@ public class BoltNeo4jConnectionImpl extends Neo4jConnectionImpl implements Bolt
 		this.checkConcurrencyParams(resultSetConcurrency);
 		this.checkHoldabilityParams(resultSetHoldability);
 		this.initTransaction();
-		return BoltNeo4jStatement.newInstance(false, this, resultSetType, resultSetConcurrency, resultSetHoldability);
+		return BoltNeo4jStatement.newInstance(this, resultSetType, resultSetConcurrency, resultSetHoldability);
 	}
 
 	/*-------------------------------*/
@@ -260,7 +260,7 @@ public class BoltNeo4jConnectionImpl extends Neo4jConnectionImpl implements Bolt
 		this.checkConcurrencyParams(resultSetConcurrency);
 		this.checkHoldabilityParams(resultSetHoldability);
 		this.initTransaction();
-		return BoltNeo4jPreparedStatement.newInstance(false, this, nativeSQL(sql), resultSetType, resultSetConcurrency, resultSetHoldability);
+		return BoltNeo4jPreparedStatement.newInstance(this, nativeSQL(sql), resultSetType, resultSetConcurrency, resultSetHoldability);
 	}
 
 	/*-------------------*/
diff --git a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/InstanceFactory.java b/neo4j-jdbc/src/main/java/org/neo4j/jdbc/InstanceFactory.java
deleted file mode 100644
index 07dafffd..00000000
--- a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/InstanceFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *
- * Copyright (c) 2016 LARUS Business Automation [http://www.larus-ba.it]
- * <p>
- * This file is part of the "LARUS Integration Framework for Neo4j".
- * <p>
- * The "LARUS Integration Framework for Neo4j" is 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- * <p>
- * Created on 19/4/2016
- *
- */
-package org.neo4j.jdbc;
-
-/**
- * @author AgileLARUS
- * @since 3.0.0
- */
-public class InstanceFactory {
-
-	private InstanceFactory () {}
-
-	public static <T extends Loggable> T debug(T obj) {
-		return obj;
-	}
-}
diff --git a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Loggable.java b/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Loggable.java
deleted file mode 100644
index adca5794..00000000
--- a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Loggable.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Copyright (c) 2016 LARUS Business Automation [http://www.larus-ba.it]
- * <p>
- * This file is part of the "LARUS Integration Framework for Neo4j".
- * <p>
- * The "LARUS Integration Framework for Neo4j" is 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- * <p>
- * Created on 19/4/2016
- *
- */
-package org.neo4j.jdbc;
-
-/**
- * @author AgileLARUS
- * @since 3.0.0
- */
-public interface Loggable {
-	boolean hasDebug();
-
-	void setDebug(boolean debug);
-
-	void setDebugLevel(int level);
-
-	int getDebugLevel();
-}
diff --git a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Neo4jResultSet.java b/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Neo4jResultSet.java
index 932fe680..001cfdca 100644
--- a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Neo4jResultSet.java
+++ b/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Neo4jResultSet.java
@@ -33,7 +33,7 @@ import java.util.Map;
  * @author AgileLARUS
  * @since 3.0.0
  */
-public abstract class Neo4jResultSet implements ResultSet, Loggable {
+public abstract class Neo4jResultSet implements ResultSet {
 
 	public static final int DEFAULT_TYPE        = TYPE_FORWARD_ONLY;
 	public static final int DEFAULT_CONCURRENCY = CONCUR_READ_ONLY;
@@ -47,8 +47,6 @@ public abstract class Neo4jResultSet implements ResultSet, Loggable {
 	 */
 	protected boolean isClosed         = false;
 	protected int     currentRowNumber = 0;
-	protected boolean debug;
-	protected int     debugLevel;
 	protected int     type;
 	protected int     concurrency;
 	protected int     holdability;
@@ -771,20 +769,4 @@ public abstract class Neo4jResultSet implements ResultSet, Loggable {
 	@Override public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
 		throw ExceptionBuilder.buildUnsupportedOperationException();
 	}
-
-	@Override public boolean hasDebug() {
-		return this.debug;
-	}
-
-	@Override public void setDebug(boolean debug) {
-		this.debug = debug;
-	}
-
-	@Override public void setDebugLevel(int debugLevel) {
-		this.debugLevel = debugLevel;
-	}
-
-	@Override public int getDebugLevel() {
-		return this.debugLevel;
-	}
 }
diff --git a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Neo4jStatement.java b/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Neo4jStatement.java
index 96ef3953..e04aecab 100644
--- a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Neo4jStatement.java
+++ b/neo4j-jdbc/src/main/java/org/neo4j/jdbc/Neo4jStatement.java
@@ -33,14 +33,12 @@ import java.util.List;
  * @author AgileLARUS
  * @since 3.0.0
  */
-public abstract class Neo4jStatement implements Statement, Loggable {
+public abstract class Neo4jStatement implements Statement {
 
 	protected Neo4jConnection connection;
 	protected ResultSet       currentResultSet;
 	protected int             currentUpdateCount;
 	protected List<String>    batchStatements;
-	protected boolean         debug;
-	protected int             debugLevel;
 	protected int[]           resultSetParams;
 	private   int             maxRows;
 	private   int             queryTimeout;
@@ -326,20 +324,4 @@ public abstract class Neo4jStatement implements Statement, Loggable {
 		this.checkClosed();
 		return false;
 	}
-
-	@Override public boolean hasDebug() {
-		return this.debug;
-	}
-
-	@Override public void setDebug(boolean debug) {
-		this.debug = debug;
-	}
-
-	@Override public void setDebugLevel(int level) {
-		this.debugLevel = level;
-	}
-
-	@Override public int getDebugLevel() {
-		return this.debugLevel;
-	}
 }
diff --git a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/impl/Neo4jConnectionImpl.java b/neo4j-jdbc/src/main/java/org/neo4j/jdbc/impl/Neo4jConnectionImpl.java
index f93b1dbc..011e112a 100644
--- a/neo4j-jdbc/src/main/java/org/neo4j/jdbc/impl/Neo4jConnectionImpl.java
+++ b/neo4j-jdbc/src/main/java/org/neo4j/jdbc/impl/Neo4jConnectionImpl.java
@@ -76,10 +76,6 @@ public abstract class Neo4jConnectionImpl implements Neo4jConnection {
 		this.holdability = defaultHoldability;
 	}
 
-	public static boolean hasDebug(Properties properties) {
-		return "true".equalsIgnoreCase(properties.getProperty("debug", "false"));
-	}
-
 	/**
 	 * Get the connection url.
 	 *


Test patch:
diff --git a/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/BoltNeo4jPreparedStatementTest.java b/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/BoltNeo4jPreparedStatementTest.java
index a1a73a9f..84d076d0 100644
--- a/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/BoltNeo4jPreparedStatementTest.java
+++ b/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/BoltNeo4jPreparedStatementTest.java
@@ -98,7 +98,7 @@ public class BoltNeo4jPreparedStatementTest {
 
 	@Before public void interceptBoltResultSetConstructor() throws SQLException {
 		expectedResultSet = mock(BoltNeo4jResultSet.class);
-		resultSetFactory = (debug, statement, iterator, params) -> expectedResultSet;
+		resultSetFactory = (statement, iterator, params) -> expectedResultSet;
 		preparedStatementOneParam = new BoltNeo4jPreparedStatement(mockOpenConnection(), resultSetFactory, "RETURN $1");
 		preparedStatementTwoParams = new BoltNeo4jPreparedStatement(mockOpenConnection(), resultSetFactory, "RETURN $1+$2");
 	}
@@ -119,7 +119,7 @@ public class BoltNeo4jPreparedStatementTest {
 	}
 
 	@Test public void closeShouldNotCallCloseOnAnyResultSet() throws Exception {
-		PreparedStatement prStatement = BoltNeo4jPreparedStatement.newInstance(false, mockOpenConnectionWithResult(null), "");
+		PreparedStatement prStatement = BoltNeo4jPreparedStatement.newInstance(mockOpenConnectionWithResult(null), "");
 
 		prStatement.close();
 
@@ -565,7 +565,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void getResultSetConcurrencyShouldThrowExceptionWhenCalledOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockConnectionClosed(), "");
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockConnectionClosed(), "");
 		statement.close();
 		statement.getResultSetConcurrency();
 	}
@@ -576,7 +576,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void getResultSetHoldabilityShouldThrowExceptionWhenCalledOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockConnectionClosed(), "");
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockConnectionClosed(), "");
 		statement.close();
 		statement.getResultSetHoldability();
 	}
@@ -587,7 +587,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void getResultSetTypeShouldThrowExceptionWhenCalledOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockConnectionClosed(), "");
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockConnectionClosed(), "");
 		statement.close();
 		statement.getResultSetType();
 	}
@@ -598,15 +598,14 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void executeQueryShouldThrowExceptionWhenClosedConnection() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockConnectionClosed(), "", 0, 0, 0);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockConnectionClosed(), "", 0, 0, 0);
 		statement.executeQuery();
 	}
 
 	@Test public void executeQueryShouldReturnCorrectResultSetStructureConnectionNotAutocommit() throws Exception {
 		int[] parameters = {ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT};
 		AtomicBoolean called = new AtomicBoolean(false);
-		PreparedStatement statement = new BoltNeo4jPreparedStatement(mockOpenConnectionWithResult(null), (debug, stmt, iterator, params) -> {
-			assertFalse(debug);
+		PreparedStatement statement = new BoltNeo4jPreparedStatement(mockOpenConnectionWithResult(null), (stmt, iterator, params) -> {
 			assertNotNull(stmt);
 			assertNull(iterator);
 			assertArrayEquals(parameters, params);
@@ -621,7 +620,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void executeQueryShouldThrowExceptionOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
 		statement.close();
 
 		statement.executeQuery();
@@ -641,7 +640,7 @@ public class BoltNeo4jPreparedStatementTest {
 		when(mockSummaryCounters.nodesDeleted()).thenReturn(0);
 
 		PreparedStatement statement = BoltNeo4jPreparedStatement
-				.newInstance(false, mockOpenConnectionWithResult(mockResult), StatementData.STATEMENT_CREATE_TWO_PROPERTIES_PARAMETRIC,
+				.newInstance(mockOpenConnectionWithResult(mockResult), StatementData.STATEMENT_CREATE_TWO_PROPERTIES_PARAMETRIC,
 						ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT);
 		statement.setString(1, "test");
 		statement.setString(2, "test2");
@@ -651,7 +650,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void executeUpdateShouldThrowExceptionOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
 		statement.close();
 
 		statement.executeUpdate();
@@ -660,7 +659,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void executeUpdateShouldThrowExceptionOnClosedConnection() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockConnectionClosed(), "", 0, 0, 0);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockConnectionClosed(), "", 0, 0, 0);
 		statement.executeUpdate();
 	}
 
@@ -685,7 +684,7 @@ public class BoltNeo4jPreparedStatementTest {
 		when(mockSummaryCounters.nodesDeleted()).thenReturn(0);
 
 		PreparedStatement statement = BoltNeo4jPreparedStatement
-				.newInstance(false, mockOpenConnectionWithResult(mockResult), StatementData.STATEMENT_CREATE_TWO_PROPERTIES_PARAMETRIC,
+				.newInstance(mockOpenConnectionWithResult(mockResult), StatementData.STATEMENT_CREATE_TWO_PROPERTIES_PARAMETRIC,
 						ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT);
 		statement.setString(1, "test");
 		statement.setString(2, "test2");
@@ -695,7 +694,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void executeShouldThrowExceptionOnQueryOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
 		statement.close();
 
 		statement.execute();
@@ -704,7 +703,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void executeShouldThrowExceptionOnUpdateOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockOpenConnection(), StatementData.STATEMENT_CREATE);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockOpenConnection(), StatementData.STATEMENT_CREATE);
 		statement.close();
 
 		statement.execute();
@@ -713,7 +712,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void executeShouldThrowExceptionOnQueryOnClosedConnection() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockConnectionClosed(), "", 0, 0, 0);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockConnectionClosed(), "", 0, 0, 0);
 		when(statement.executeQuery()).thenCallRealMethod();
 		statement.execute();
 	}
@@ -721,7 +720,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void executeShouldThrowExceptionOnUpdateOnClosedConnection() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockConnectionClosed(), "", 0, 0, 0);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockConnectionClosed(), "", 0, 0, 0);
 		when(statement.executeUpdate()).thenCallRealMethod();
 		statement.execute();
 	}
@@ -738,7 +737,7 @@ public class BoltNeo4jPreparedStatementTest {
 	}
 
 	@Test public void getUpdateCountShouldReturnMinusOne() throws SQLException {
-		ResultSetFactory nullRsFactory = (debug, stmt, iterator, params) -> null;
+		ResultSetFactory nullRsFactory = (stmt, iterator, params) -> null;
 		BoltNeo4jPreparedStatement statement = new BoltNeo4jPreparedStatement(mockOpenConnection(), nullRsFactory, "RETURN 42");
 
 		assertEquals(-1, statement.getUpdateCount());
@@ -747,7 +746,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void getUpdateCountShouldThrowExceptionOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
 		statement.close();
 
 		statement.getUpdateCount();
@@ -775,7 +774,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void getResultSetShouldThrowExceptionOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(false, mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
+		PreparedStatement statement = BoltNeo4jPreparedStatement.newInstance(mockOpenConnection(), StatementData.STATEMENT_MATCH_ALL);
 		statement.close();
 
 		statement.getResultSet();
@@ -816,7 +815,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void addBatchShouldThrowExceptionIfClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(false, Mocker.mockOpenConnection(), "?");
+		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(Mocker.mockOpenConnection(), "?");
 		stmt.setInt(1, 1);
 		stmt.close();
 		stmt.addBatch();
@@ -838,7 +837,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void clearBatchShouldThrowExceptionIfClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(false, Mocker.mockOpenConnection(), "?");
+		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(Mocker.mockOpenConnection(), "?");
 		stmt.close();
 		stmt.clearBatch();
 	}
@@ -863,7 +862,7 @@ public class BoltNeo4jPreparedStatementTest {
         when(summaryCounters.nodesCreated()).thenReturn(1);
         when(summaryCounters.nodesDeleted()).thenReturn(0);
 
-		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(false, connection, "MATCH n WHERE id(n) = ? SET n.property=1");
+		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(connection, "MATCH n WHERE id(n) = ? SET n.property=1");
 		stmt.setInt(1, 1);
 		stmt.addBatch();
 		stmt.setInt(1, 2);
@@ -873,7 +872,7 @@ public class BoltNeo4jPreparedStatementTest {
 	}
 
 	@Test public void executeBatchShouldThrowExceptionOnError() throws SQLException {
-		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(false, Mocker.mockOpenConnection(), "?");
+		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(Mocker.mockOpenConnection(), "?");
 		stmt.setInt(1, 1);
 		stmt.addBatch();
 		stmt.setInt(1, 2);
@@ -899,7 +898,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void executeBatchShouldThrowExceptionOnClosed() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(false, Mocker.mockConnectionClosed(), "?");
+		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(Mocker.mockConnectionClosed(), "?");
 		stmt.setInt(1, 1);
 		stmt.addBatch();
 		stmt.setInt(1, 2);
@@ -914,7 +913,7 @@ public class BoltNeo4jPreparedStatementTest {
 	/*------------------------------*/
 
 	@Test public void getConnectionShouldWork() throws SQLException {
-		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(false, Mocker.mockOpenConnection(), "?");
+		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(Mocker.mockOpenConnection(), "?");
 
 		assertNotNull(stmt.getConnection());
 		assertEquals(Mocker.mockOpenConnection().getClass(), stmt.getConnection().getClass());
@@ -923,7 +922,7 @@ public class BoltNeo4jPreparedStatementTest {
 	@Test public void getConnectionShouldThrowExceptionOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(false, Mocker.mockConnectionClosed(), "?");
+		PreparedStatement stmt = BoltNeo4jPreparedStatement.newInstance(Mocker.mockConnectionClosed(), "?");
 		stmt.close();
 
 		stmt.getConnection();
diff --git a/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/BoltNeo4jStatementTest.java b/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/BoltNeo4jStatementTest.java
index 3968b15c..836c4d07 100644
--- a/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/BoltNeo4jStatementTest.java
+++ b/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/BoltNeo4jStatementTest.java
@@ -80,7 +80,7 @@ public class BoltNeo4jStatementTest {
 
 	@Before public void interceptBoltResultSetConstructor() throws Exception {
 		expectedResultSet = mock(BoltNeo4jResultSet.class);
-		resultSetFactory = (debug, statement, iterator, params) -> expectedResultSet;
+		resultSetFactory = (statement, iterator, params) -> expectedResultSet;
 		BoltNeo4jResultSet mockedRS = mock(BoltNeo4jResultSet.class);
 		doNothing().when(mockedRS).close();
 	}
@@ -117,7 +117,7 @@ public class BoltNeo4jStatementTest {
 		BoltNeo4jConnectionImpl mockConnection = mockOpenConnection();
 		when(mockConnection.getTransaction()).thenReturn(mockTransaction);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockConnection);
+		Statement statement = BoltNeo4jStatement.newInstance(mockConnection);
 
 		statement.close();
 
@@ -131,7 +131,7 @@ public class BoltNeo4jStatementTest {
 	/*------------------------------*/
 
 	@Test public void isClosedShouldReturnFalseWhenCreated() throws SQLException {
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockOpenConnection());
+		Statement statement = BoltNeo4jStatement.newInstance(mockOpenConnection());
 		assertFalse(statement.isClosed());
 	}
 
@@ -143,7 +143,7 @@ public class BoltNeo4jStatementTest {
 		Result mockResult = mock(Result.class);
 
 		Statement statement = BoltNeo4jStatement
-				.newInstance(false, mockOpenConnectionWithResult(mockResult), ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
+				.newInstance(mockOpenConnectionWithResult(mockResult), ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
 						ResultSet.HOLD_CURSORS_OVER_COMMIT);
 		statement.executeQuery(StatementData.STATEMENT_CREATE);
 	}
@@ -151,7 +151,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void executeQueryShouldThrowExceptionWhenClosedConnection() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockConnectionClosed(), 0, 0, 0);
+		Statement statement = BoltNeo4jStatement.newInstance(mockConnectionClosed(), 0, 0, 0);
 		statement.executeQuery(StatementData.STATEMENT_MATCH_ALL);
 	}
 
@@ -159,7 +159,7 @@ public class BoltNeo4jStatementTest {
 		BoltNeo4jConnectionImpl mockConnection = mockOpenConnectionWithResult(null);
 
 		Statement statement = BoltNeo4jStatement
-				.newInstance(false, mockConnection, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT);
+				.newInstance(mockConnection, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT);
 		statement.executeQuery(StatementData.STATEMENT_MATCH_ALL);
 
 //		verifyStatic(BoltNeo4jResultSet.class);
@@ -169,7 +169,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void executeQueryShouldThrowExceptionOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockOpenConnection());
+		Statement statement = BoltNeo4jStatement.newInstance(mockOpenConnection());
 		statement.close();
 
 		statement.executeQuery(StatementData.STATEMENT_MATCH_ALL);
@@ -194,7 +194,7 @@ public class BoltNeo4jStatementTest {
 	@Ignore @Test public void executeQueryShouldThrowExceptionOnTimeoutExceeded() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, new BoltNeo4jConnectionImpl(mockDriverOpen(), new Properties(), ""), 0, 0, 0);
+		Statement statement = BoltNeo4jStatement.newInstance(new BoltNeo4jConnectionImpl(mockDriverOpen(), new Properties(), ""), 0, 0, 0);
 		statement.setQueryTimeout(1);
 		statement.executeQuery(StatementData.STATEMENT_CREATE);
 
@@ -216,7 +216,7 @@ public class BoltNeo4jStatementTest {
 		when(mockSummaryCounters.nodesDeleted()).thenReturn(0);
 
 		Statement statement = BoltNeo4jStatement
-				.newInstance(false, mockOpenConnectionWithResult(mockResult), ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
+				.newInstance(mockOpenConnectionWithResult(mockResult), ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
 						ResultSet.HOLD_CURSORS_OVER_COMMIT);
 		statement.executeUpdate(StatementData.STATEMENT_CREATE);
 	}
@@ -249,7 +249,7 @@ public class BoltNeo4jStatementTest {
 	@Ignore @Test public void executeUpdateShouldThrowExceptionOnTimeoutExceeded() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, new BoltNeo4jConnectionImpl(mockDriverOpen(), new Properties(), ""), 0, 0, 0);
+		Statement statement = BoltNeo4jStatement.newInstance(new BoltNeo4jConnectionImpl(mockDriverOpen(), new Properties(), ""), 0, 0, 0);
 		statement.setQueryTimeout(1);
 		statement.executeUpdate(StatementData.STATEMENT_CREATE);
 
@@ -262,7 +262,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void getResultSetConcurrencyShouldThrowExceptionWhenCalledOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockConnectionClosed());
+		Statement statement = BoltNeo4jStatement.newInstance(mockConnectionClosed());
 		statement.close();
 		statement.getResultSetConcurrency();
 	}
@@ -273,7 +273,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void getResultSetHoldabilityShouldThrowExceptionWhenCalledOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockConnectionClosed());
+		Statement statement = BoltNeo4jStatement.newInstance(mockConnectionClosed());
 		statement.close();
 		statement.getResultSetHoldability();
 	}
@@ -284,7 +284,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void getResultSetTypeShouldThrowExceptionWhenCalledOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockConnectionClosed());
+		Statement statement = BoltNeo4jStatement.newInstance(mockConnectionClosed());
 		statement.close();
 		statement.getResultSetType();
 	}
@@ -311,7 +311,7 @@ public class BoltNeo4jStatementTest {
 		when(mockSummaryCounters.nodesDeleted()).thenReturn(0);
 
 		Statement statement = BoltNeo4jStatement
-				.newInstance(false, mockOpenConnectionWithResult(mockResult), ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
+				.newInstance(mockOpenConnectionWithResult(mockResult), ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
 						ResultSet.HOLD_CURSORS_OVER_COMMIT);
 		statement.execute(StatementData.STATEMENT_CREATE);
 	}
@@ -319,21 +319,21 @@ public class BoltNeo4jStatementTest {
 	@Test public void executeShouldThrowExceptionOnQueryWhenClosedConnection() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockConnectionClosed(), 0, 0, 0);
+		Statement statement = BoltNeo4jStatement.newInstance(mockConnectionClosed(), 0, 0, 0);
 		statement.execute(StatementData.STATEMENT_MATCH_ALL);
 	}
 
 	@Test public void executeShouldThrowExceptionOnUpdateWhenClosedConnection() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockConnectionClosed(), 0, 0, 0);
+		Statement statement = BoltNeo4jStatement.newInstance(mockConnectionClosed(), 0, 0, 0);
 		statement.execute(StatementData.STATEMENT_CREATE);
 	}
 
 	@Test public void executeShouldThrowExceptionOnQueryOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockOpenConnection());
+		Statement statement = BoltNeo4jStatement.newInstance(mockOpenConnection());
 		statement.close();
 
 		statement.execute(StatementData.STATEMENT_MATCH_ALL);
@@ -342,7 +342,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void executeShouldThrowExceptionOnUpdateOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockOpenConnection());
+		Statement statement = BoltNeo4jStatement.newInstance(mockOpenConnection());
 		statement.close();
 
 		statement.execute(StatementData.STATEMENT_CREATE);
@@ -376,7 +376,7 @@ public class BoltNeo4jStatementTest {
 	@Ignore @Test public void executeShouldThrowExceptionOnTimeoutExceeded() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, new BoltNeo4jConnectionImpl(mockDriverOpen(), new Properties(), ""), 0, 0, 0);
+		Statement statement = BoltNeo4jStatement.newInstance(new BoltNeo4jConnectionImpl(mockDriverOpen(), new Properties(), ""), 0, 0, 0);
 		statement.setQueryTimeout(1);
 		statement.execute(StatementData.STATEMENT_CREATE);
 
@@ -405,7 +405,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void getUpdateCountShouldThrowExceptionOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockOpenConnection());
+		Statement statement = BoltNeo4jStatement.newInstance(mockOpenConnection());
 		statement.close();
 
 		statement.getUpdateCount();
@@ -434,7 +434,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void getResultSetShouldThrowExceptionOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement statement = BoltNeo4jStatement.newInstance(false, mockOpenConnection());
+		Statement statement = BoltNeo4jStatement.newInstance(mockOpenConnection());
 		statement.close();
 
 		statement.getResultSet();
@@ -459,7 +459,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void addBatchShouldThrowExceptionIfClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement stmt = BoltNeo4jStatement.newInstance(false, Mocker.mockOpenConnection());
+		Statement stmt = BoltNeo4jStatement.newInstance(Mocker.mockOpenConnection());
 		stmt.close();
 		stmt.addBatch("");
 	}
@@ -481,7 +481,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void clearBatchShouldThrowExceptionIfClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement stmt = BoltNeo4jStatement.newInstance(false, Mocker.mockOpenConnection());
+		Statement stmt = BoltNeo4jStatement.newInstance(Mocker.mockOpenConnection());
 		stmt.close();
 		stmt.clearBatch();
 	}
@@ -505,7 +505,7 @@ public class BoltNeo4jStatementTest {
 		when(summaryCounters.nodesCreated()).thenReturn(1);
 		when(summaryCounters.nodesDeleted()).thenReturn(0);
 
-		Statement stmt = BoltNeo4jStatement.newInstance(false, connection);
+		Statement stmt = BoltNeo4jStatement.newInstance(connection);
 		String str1 = "MATCH n WHERE id(n) = 1 SET n.property=1";
 		String str2 = "MATCH n WHERE id(n) = 2 SET n.property=2";
 		stmt.addBatch(str1);
@@ -515,7 +515,7 @@ public class BoltNeo4jStatementTest {
 	}
 
 	@Test public void executeBatchShouldThrowExceptionOnError() throws SQLException {
-		Statement stmt = BoltNeo4jStatement.newInstance(false, Mocker.mockOpenConnection());
+		Statement stmt = BoltNeo4jStatement.newInstance(Mocker.mockOpenConnection());
 		stmt.addBatch("MATCH n WHERE id(n) = 1 SET n.property=1");
 		stmt.addBatch("MATCH n WHERE id(n) = 2 SET n.property=2");
 
@@ -539,7 +539,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void executeBatchShouldThrowExceptionOnClosed() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement stmt = BoltNeo4jStatement.newInstance(false, Mocker.mockConnectionClosed());
+		Statement stmt = BoltNeo4jStatement.newInstance(Mocker.mockConnectionClosed());
 		String str1 = "MATCH n WHERE id(n) = 1 SET n.property=1";
 		String str2 = "MATCH n WHERE id(n) = 2 SET n.property=2";
 		stmt.addBatch(str1);
@@ -554,7 +554,7 @@ public class BoltNeo4jStatementTest {
 	/*------------------------------*/
 
 	@Test public void getConnectionShouldWork() throws SQLException {
-		Statement stmt = BoltNeo4jStatement.newInstance(false, Mocker.mockOpenConnection());
+		Statement stmt = BoltNeo4jStatement.newInstance(Mocker.mockOpenConnection());
 
 		assertNotNull(stmt.getConnection());
 		assertEquals(Mocker.mockOpenConnection().getClass(), stmt.getConnection().getClass());
@@ -563,7 +563,7 @@ public class BoltNeo4jStatementTest {
 	@Test public void getConnectionShouldThrowExceptionOnClosedStatement() throws SQLException {
 		expectedEx.expect(SQLException.class);
 
-		Statement stmt = BoltNeo4jStatement.newInstance(false, Mocker.mockConnectionClosed());
+		Statement stmt = BoltNeo4jStatement.newInstance(Mocker.mockConnectionClosed());
 		stmt.close();
 
 		stmt.getConnection();
diff --git a/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/SamplePT.java b/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/SamplePT.java
index 0d2bbdf7..9c233d09 100644
--- a/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/SamplePT.java
+++ b/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/bolt/SamplePT.java
@@ -75,19 +75,16 @@ public class SamplePT {
 	@State(Scope.Benchmark) public static class Data {
 		@Setup public void initialize() throws ClassNotFoundException, SQLException, IOException {
 			jdbcConnection = DriverManager.getConnection("jdbc:neo4j:bolt://localhost:7687?user=neo4j,password=test");
-			jdbcConnectionDebug = DriverManager.getConnection("jdbc:neo4j:bolt://localhost:7687?user=neo4j,password=test,debug");
 			driver = GraphDatabase.driver("bolt://localhost:7687", AuthTokens.basic("neo4j", "test"));
 		}
 
 		@TearDown public void close() throws ClassNotFoundException, SQLException, IOException {
 			jdbcConnection.close();
-			jdbcConnectionDebug.close();
 			driver.close();
 		}
 
 		public String query = "MATCH (n) RETURN n";
 		public Connection jdbcConnection;
-		public Connection jdbcConnectionDebug;
 		public org.neo4j.driver.Driver driver;
 
 	}
@@ -105,12 +102,4 @@ public class SamplePT {
 		bh.consume(session.run(data.query));
 		session.close();
 	}
-
-	@Benchmark public void testSimpleQueryWithDebugJDBC(Data data, Blackhole bh) throws SQLException {
-		System.setOut(Mockito.mock(PrintStream.class));
-		Connection conn = data.jdbcConnectionDebug;
-		Statement stmt = conn.createStatement();
-		bh.consume(stmt.executeQuery(data.query));
-		stmt.close();
-	}
 }
diff --git a/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/boltrouting/BoltRoutingIT.java b/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/boltrouting/BoltRoutingIT.java
index 1e6c90f2..460ef099 100644
--- a/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/boltrouting/BoltRoutingIT.java
+++ b/neo4j-jdbc-bolt/src/test/java/org/neo4j/jdbc/boltrouting/BoltRoutingIT.java
@@ -49,8 +49,8 @@ public class BoltRoutingIT {
     private static final String NEO4J_USER = "neo4j";
     private static final String NEO4J_PASSWORD = "jdbc";
 
-//    private String connectionUrl = "jdbc:neo4j:bolt+routing://localhost:17681?noSsl&debug=true&routing:policy=EU&routing:servers=localhost:17682;localhost:17683;localhost:17684;localhost:17685;localhost:17686;localhost:17687";
-//    private String connectionUrl2 = "jdbc:neo4j:bolt+routing://localhost:17681,localhost:17682,localhost:17683,localhost:17684,localhost:17685,localhost:17686,localhost:17687?noSsl&debug=true&routing:policy=EU";
+//    private String connectionUrl = "jdbc:neo4j:bolt+routing://localhost:17681?noSsl&routing:policy=EU&routing:servers=localhost:17682;localhost:17683;localhost:17684;localhost:17685;localhost:17686;localhost:17687";
+//    private String connectionUrl2 = "jdbc:neo4j:bolt+routing://localhost:17681,localhost:17682,localhost:17683,localhost:17684,localhost:17685,localhost:17686,localhost:17687?noSsl&routing:policy=EU";
 
     private static TestcontainersCausalCluster cluster;