Skip to content

Commit c4a4639

Browse files
committed
Added Logger#warn(String, Throwable)
And removed unused test events based infrastructure.
1 parent d1ebf47 commit c4a4639

File tree

11 files changed

+72
-747
lines changed

11 files changed

+72
-747
lines changed

driver/src/main/java/org/neo4j/driver/internal/logging/DelegatingLogger.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ public void warn( String message, Object... params )
5656
delegate.warn( messageWithPrefix( message ), params );
5757
}
5858

59+
@Override
60+
public void warn( String message, Throwable cause )
61+
{
62+
delegate.warn( messageWithPrefix( message ), cause );
63+
}
64+
5965
@Override
6066
public void debug( String message, Object... params )
6167
{

driver/src/main/java/org/neo4j/driver/internal/logging/DevNullLogger.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ public void warn( String message, Object... params )
4343
{
4444
}
4545

46+
@Override
47+
public void warn( String message, Throwable cause )
48+
{
49+
}
50+
4651
@Override
4752
public void debug( String message, Object... params )
4853
{

driver/src/main/java/org/neo4j/driver/internal/logging/JULogger.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ public void warn( String format, Object... params )
5454
delegate.log( Level.WARNING, String.format( format, params ) );
5555
}
5656

57+
@Override
58+
public void warn( String message, Throwable cause )
59+
{
60+
delegate.log( Level.WARNING, message, cause );
61+
}
62+
5763
@Override
5864
public void debug( String format, Object... params )
5965
{

driver/src/main/java/org/neo4j/driver/v1/Logger.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,41 @@ public interface Logger
2525
{
2626
/**
2727
* Logs errors from this driver
28+
*
2829
* @param message the error message
2930
* @param cause the cause of the error
3031
*/
3132
void error( String message, Throwable cause );
3233

3334
/**
3435
* Logs information from the driver
36+
*
3537
* @param message the information message
3638
* @param params parameters used in the information message
3739
*/
3840
void info( String message, Object... params );
3941

4042
/**
4143
* Logs warnings that happened during using the driver
44+
*
4245
* @param message the warning message
4346
* @param params parameters used in the warning message
4447
*/
4548
void warn( String message, Object... params );
4649

50+
/**
51+
* Logs warnings that happened during using the driver
52+
*
53+
* @param message the warning message
54+
* @param cause the cause of the warning
55+
*/
56+
void warn( String message, Throwable cause );
57+
4758
/**
4859
* Logs bolt messages sent and received by this driver.
4960
* It is only enabled when {@link Logger#isDebugEnabled()} returns {@code True}.
5061
* This logging level generates a lot of log entries.
62+
*
5163
* @param message the bolt message
5264
* @param params parameters used in generating the bolt message
5365
*/
@@ -57,22 +69,25 @@ public interface Logger
5769
* Logs binary sent and received by this driver.
5870
* It is only enabled when {@link Logger#isTraceEnabled()} returns {@code True}.
5971
* This logging level generates huge amount of log entries.
72+
*
6073
* @param message the bolt message in hex
6174
* @param params parameters used in generating the hex message
6275
*/
6376
void trace( String message, Object... params );
6477

6578
/**
6679
* Return true if the trace logging level is enabled.
67-
* @see Logger#trace(String, Object...)
80+
*
6881
* @return true if the trace logging level is enabled.
82+
* @see Logger#trace(String, Object...)
6983
*/
7084
boolean isTraceEnabled();
7185

7286
/**
7387
* Return true if the debug level is enabled.
74-
* @see Logger#debug(String, Object...)
88+
*
7589
* @return true if the debug level is enabled.
90+
* @see Logger#debug(String, Object...)
7691
*/
7792
boolean isDebugEnabled();
7893
}

driver/src/test/java/org/neo4j/driver/internal/Event.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)