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 ec1de15d7f..700c9df2d4 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java +++ b/driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java @@ -160,7 +160,7 @@ public void close() } catch ( Throwable e ) { - logger.warn( "Failed to close transaction", e ); + logger.error( "Failed to close transaction", e ); } } } diff --git a/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java b/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java index 4a65c057dc..629baf52e2 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java +++ b/driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java @@ -43,11 +43,6 @@ public void warn( String message, Object... params ) { } - @Override - public void warn( String message, Throwable cause ) - { - } - @Override public void debug( String message, Object... params ) { diff --git a/driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java b/driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java index e1a9ccb981..79fd78a8de 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java +++ b/driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java @@ -54,12 +54,6 @@ public void warn( String format, Object... params ) delegate.log( Level.WARNING, String.format( format, params ) ); } - @Override - public void warn( String message, Throwable cause ) - { - delegate.log( Level.WARNING, message, cause ); - } - @Override public void debug( String format, Object... params ) { diff --git a/driver/src/main/java/org/neo4j/driver/internal/net/SocketClient.java b/driver/src/main/java/org/neo4j/driver/internal/net/SocketClient.java index eabdf39ced..9ca84c56a2 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/net/SocketClient.java +++ b/driver/src/main/java/org/neo4j/driver/internal/net/SocketClient.java @@ -203,7 +203,7 @@ public void stop() } else { - logger.warn( "Unable to close socket connection properly: '" + e.getMessage() + "'", e ); + logger.error( "Unable to close socket connection properly", e ); } } } diff --git a/driver/src/main/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogic.java b/driver/src/main/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogic.java index ae9d83f26a..a30290e42b 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogic.java +++ b/driver/src/main/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogic.java @@ -95,7 +95,7 @@ public T retry( Supplier work ) if ( elapsedTime < maxRetryTimeMs ) { long delayWithJitterMs = computeDelayWithJitter( nextDelayMs ); - log.warn( "Transaction failed and will be retried in " + delayWithJitterMs + "ms", error ); + log.error( "Transaction failed and will be retried in " + delayWithJitterMs + "ms", error ); sleep( delayWithJitterMs ); nextDelayMs = (long) (nextDelayMs * multiplier); diff --git a/driver/src/main/java/org/neo4j/driver/internal/security/TLSSocketChannel.java b/driver/src/main/java/org/neo4j/driver/internal/security/TLSSocketChannel.java index 5abea24f60..5e956403ec 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/security/TLSSocketChannel.java +++ b/driver/src/main/java/org/neo4j/driver/internal/security/TLSSocketChannel.java @@ -28,11 +28,11 @@ import javax.net.ssl.SSLHandshakeException; import org.neo4j.driver.internal.net.BoltServerAddress; -import org.neo4j.driver.v1.Logger; import org.neo4j.driver.internal.util.BytePrinter; +import org.neo4j.driver.v1.Logger; import org.neo4j.driver.v1.exceptions.ClientException; -import org.neo4j.driver.v1.exceptions.ServiceUnavailableException; import org.neo4j.driver.v1.exceptions.SecurityException; +import org.neo4j.driver.v1.exceptions.ServiceUnavailableException; import static java.lang.String.format; import static javax.net.ssl.SSLEngineResult.HandshakeStatus.FINISHED; @@ -474,7 +474,7 @@ public void close() throws IOException catch ( IOException e ) { // Treat this as ok - the connection is closed, even if the TLS session did not exit cleanly. - logger.warn( "TLS socket could not be closed cleanly: '" + e.getMessage() + "'", e ); + logger.error( "TLS socket could not be closed cleanly", e ); } } diff --git a/driver/src/main/java/org/neo4j/driver/v1/Logger.java b/driver/src/main/java/org/neo4j/driver/v1/Logger.java index d59429d542..b913320de0 100644 --- a/driver/src/main/java/org/neo4j/driver/v1/Logger.java +++ b/driver/src/main/java/org/neo4j/driver/v1/Logger.java @@ -29,8 +29,6 @@ public interface Logger void warn( String message, Object... params ); - void warn( String message, Throwable cause ); - void debug( String message, Object... params ); void trace( String message, Object... params ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java b/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java index 5dd749d6b6..e6916c474c 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/retry/ExponentialBackoffRetryLogicTest.java @@ -446,7 +446,7 @@ public void eachRetryIsLogged() retry( logic, retries ); - verify( logger, times( retries ) ).warn( + verify( logger, times( retries ) ).error( startsWith( "Transaction failed and will be retried" ), any( ServiceUnavailableException.class ) ); diff --git a/driver/src/test/java/org/neo4j/driver/v1/EventLogger.java b/driver/src/test/java/org/neo4j/driver/v1/EventLogger.java index b2f7ed47c8..e3dd9efc82 100644 --- a/driver/src/test/java/org/neo4j/driver/v1/EventLogger.java +++ b/driver/src/test/java/org/neo4j/driver/v1/EventLogger.java @@ -110,12 +110,6 @@ public void warn( String message, Object... params ) events.log( name, Level.WARN, null, message, params ); } - @Override - public void warn( String message, Throwable cause ) - { - events.log( name, Level.WARN, cause, message ); - } - @Override public void debug( String message, Object... params ) {