Skip to content

Commit 376c6d7

Browse files
lutovichlutovich
committed
Renamed DelegatingLogger to PrefixedLogger 
1 parent 200857b commit 376c6d7

File tree

9 files changed

+37
-37
lines changed

9 files changed

+37
-37
lines changed

‎driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.concurrent.atomic.AtomicBoolean;
2626

2727
import org.neo4j.driver.internal.async.QueryRunner;
28-
import org.neo4j.driver.internal.logging.DelegatingLogger;
28+
import org.neo4j.driver.internal.logging.PrefixedLogger;
2929
import org.neo4j.driver.internal.retry.RetryLogic;
3030
import org.neo4j.driver.internal.spi.Connection;
3131
import org.neo4j.driver.internal.spi.ConnectionProvider;
@@ -73,7 +73,7 @@ public NetworkSession( ConnectionProvider connectionProvider, AccessMode mode, R
7373
this.connectionProvider = connectionProvider;
7474
this.mode = mode;
7575
this.retryLogic = retryLogic;
76-
this.logger = new DelegatingLogger( "[" + hashCode() + "]", logging.getLog( LOG_NAME ) );
76+
this.logger = new PrefixedLogger( "[" + hashCode() + "]", logging.getLog( LOG_NAME ) );
7777
}
7878

7979
@Override

‎driver/src/main/java/org/neo4j/driver/internal/async/HandshakeHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.List;
2929
import javax.net.ssl.SSLHandshakeException;
3030

31-
import org.neo4j.driver.internal.logging.DelegatingLogger;
31+
import org.neo4j.driver.internal.logging.PrefixedLogger;
3232
import org.neo4j.driver.internal.messaging.MessageFormat;
3333
import org.neo4j.driver.internal.messaging.PackStreamMessageFormatV1;
3434
import org.neo4j.driver.internal.util.ErrorUtil;
@@ -62,7 +62,7 @@ public HandshakeHandler( ChannelPipelineBuilder pipelineBuilder, ChannelPromise
6262
@Override
6363
public void handlerAdded( ChannelHandlerContext ctx )
6464
{
65-
log = new DelegatingLogger( ctx.channel().toString(), logging, getClass() );
65+
log = new PrefixedLogger( ctx.channel().toString(), logging, getClass() );
6666
}
6767

6868
@Override

‎driver/src/main/java/org/neo4j/driver/internal/async/inbound/ChannelErrorHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import java.io.IOException;
2626

27-
import org.neo4j.driver.internal.logging.DelegatingLogger;
27+
import org.neo4j.driver.internal.logging.PrefixedLogger;
2828
import org.neo4j.driver.internal.util.ErrorUtil;
2929
import org.neo4j.driver.v1.Logger;
3030
import org.neo4j.driver.v1.Logging;
@@ -50,7 +50,7 @@ public ChannelErrorHandler( Logging logging )
5050
public void handlerAdded( ChannelHandlerContext ctx )
5151
{
5252
messageDispatcher = requireNonNull( messageDispatcher( ctx.channel() ) );
53-
log = new DelegatingLogger( ctx.channel().toString(), logging, getClass() );
53+
log = new PrefixedLogger( ctx.channel().toString(), logging, getClass() );
5454
}
5555

5656
@Override

‎driver/src/main/java/org/neo4j/driver/internal/async/inbound/ChunkDecoder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import io.netty.channel.ChannelHandlerContext;
2323
import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
2424

25-
import org.neo4j.driver.internal.logging.DelegatingLogger;
25+
import org.neo4j.driver.internal.logging.PrefixedLogger;
2626
import org.neo4j.driver.v1.Logger;
2727
import org.neo4j.driver.v1.Logging;
2828

@@ -48,7 +48,7 @@ public ChunkDecoder( Logging logging )
4848
@Override
4949
public void handlerAdded( ChannelHandlerContext ctx )
5050
{
51-
log = new DelegatingLogger( ctx.channel().toString(), logging, getClass() );
51+
log = new PrefixedLogger( ctx.channel().toString(), logging, getClass() );
5252
}
5353

5454
@Override

‎driver/src/main/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.Queue;
2727

2828
import org.neo4j.driver.internal.handlers.AckFailureResponseHandler;
29-
import org.neo4j.driver.internal.logging.DelegatingLogger;
29+
import org.neo4j.driver.internal.logging.PrefixedLogger;
3030
import org.neo4j.driver.internal.messaging.MessageHandler;
3131
import org.neo4j.driver.internal.spi.ResponseHandler;
3232
import org.neo4j.driver.internal.util.ErrorUtil;
@@ -50,7 +50,7 @@ public class InboundMessageDispatcher implements MessageHandler
5050
public InboundMessageDispatcher( Channel channel, Logging logging )
5151
{
5252
this.channel = requireNonNull( channel );
53-
this.log = new DelegatingLogger( channel.toString(), logging, getClass() );
53+
this.log = new PrefixedLogger( channel.toString(), logging, getClass() );
5454
}
5555

5656
public void queue( ResponseHandler handler )

‎driver/src/main/java/org/neo4j/driver/internal/async/inbound/InboundMessageHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import io.netty.channel.SimpleChannelInboundHandler;
2424
import io.netty.handler.codec.DecoderException;
2525

26-
import org.neo4j.driver.internal.logging.DelegatingLogger;
26+
import org.neo4j.driver.internal.logging.PrefixedLogger;
2727
import org.neo4j.driver.internal.messaging.MessageFormat;
2828
import org.neo4j.driver.v1.Logger;
2929
import org.neo4j.driver.v1.Logging;
@@ -52,7 +52,7 @@ public InboundMessageHandler( MessageFormat messageFormat, Logging logging )
5252
public void handlerAdded( ChannelHandlerContext ctx )
5353
{
5454
messageDispatcher = requireNonNull( messageDispatcher( ctx.channel() ) );
55-
log = new DelegatingLogger( ctx.channel().toString(), logging, getClass() );
55+
log = new PrefixedLogger( ctx.channel().toString(), logging, getClass() );
5656
}
5757

5858
@Override

‎driver/src/main/java/org/neo4j/driver/internal/async/outbound/OutboundMessageHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import java.util.List;
2727

28-
import org.neo4j.driver.internal.logging.DelegatingLogger;
28+
import org.neo4j.driver.internal.logging.PrefixedLogger;
2929
import org.neo4j.driver.internal.messaging.Message;
3030
import org.neo4j.driver.internal.messaging.MessageFormat;
3131
import org.neo4j.driver.v1.Logger;
@@ -61,7 +61,7 @@ private OutboundMessageHandler( MessageFormat messageFormat, boolean byteArraySu
6161
@Override
6262
public void handlerAdded( ChannelHandlerContext ctx )
6363
{
64-
log = new DelegatingLogger( ctx.channel().toString(), logging, getClass() );
64+
log = new PrefixedLogger( ctx.channel().toString(), logging, getClass() );
6565
}
6666

6767
@Override

‎driver/src/main/java/org/neo4j/driver/internal/logging/DelegatingLogger.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/logging/PrefixedLogger.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323

2424
import static java.util.Objects.requireNonNull;
2525

26-
public class DelegatingLogger implements Logger
26+
public class PrefixedLogger implements Logger
2727
{
2828
private final Logger delegate;
2929
private final String messagePrefix;
3030

31-
public DelegatingLogger( Logger delegate )
31+
public PrefixedLogger( Logger delegate )
3232
{
3333
this( null, delegate );
3434
}
3535

36-
public DelegatingLogger( String messagePrefix, Logging logging, Class<?> owner )
36+
public PrefixedLogger( String messagePrefix, Logging logging, Class<?> owner )
3737
{
3838
this( messagePrefix, logging.getLog( owner.getSimpleName() ) );
3939
}
4040

41-
public DelegatingLogger( String messagePrefix, Logger delegate )
41+
public PrefixedLogger( String messagePrefix, Logger delegate )
4242
{
4343
this.delegate = requireNonNull( delegate );
4444
this.messagePrefix = messagePrefix;

‎driver/src/test/java/org/neo4j/driver/internal/logging/DelegatingLoggerTest.java renamed to ‎driver/src/test/java/org/neo4j/driver/internal/logging/PrefixedLoggerTest.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import static org.mockito.Mockito.verify;
3535
import static org.mockito.Mockito.when;
3636

37-
public class DelegatingLoggerTest
37+
public class PrefixedLoggerTest
3838
{
3939
private static final String PREFIX = "Output";
4040
private static final String MESSAGE = "Hello World!";
@@ -45,7 +45,7 @@ public void shouldThrowWhenDelegateIsNull()
4545
{
4646
try
4747
{
48-
new DelegatingLogger( null );
48+
new PrefixedLogger( null );
4949
fail( "Exception expected" );
5050
}
5151
catch ( Exception e )
@@ -57,15 +57,15 @@ public void shouldThrowWhenDelegateIsNull()
5757
@Test
5858
public void shouldAllowNullPrefix()
5959
{
60-
assertNotNull( new DelegatingLogger( null, newLoggerMock() ) );
60+
assertNotNull( new PrefixedLogger( null, newLoggerMock() ) );
6161
}
6262

6363
@Test
6464
public void shouldDelegateIsDebugEnabled()
6565
{
6666
Logger delegate = newLoggerMock( true, false );
6767

68-
DelegatingLogger logger = new DelegatingLogger( delegate );
68+
PrefixedLogger logger = new PrefixedLogger( delegate );
6969

7070
assertTrue( logger.isDebugEnabled() );
7171
verify( delegate ).isDebugEnabled();
@@ -76,7 +76,7 @@ public void shouldDelegateIsTraceEnabled()
7676
{
7777
Logger delegate = newLoggerMock( false, true );
7878

79-
DelegatingLogger logger = new DelegatingLogger( delegate );
79+
PrefixedLogger logger = new PrefixedLogger( delegate );
8080

8181
assertTrue( logger.isTraceEnabled() );
8282
verify( delegate ).isTraceEnabled();
@@ -87,7 +87,7 @@ public void shouldNotDelegateDebugLogWhenDebugDisabled()
8787
{
8888
Logger delegate = newLoggerMock();
8989

90-
DelegatingLogger logger = new DelegatingLogger( delegate );
90+
PrefixedLogger logger = new PrefixedLogger( delegate );
9191
logger.debug( MESSAGE );
9292

9393
verify( delegate, never() ).debug( anyString(), anyVararg() );
@@ -98,7 +98,7 @@ public void shouldNotDelegateTraceLogWhenTraceDisabled()
9898
{
9999
Logger delegate = newLoggerMock();
100100

101-
DelegatingLogger logger = new DelegatingLogger( delegate );
101+
PrefixedLogger logger = new PrefixedLogger( delegate );
102102
logger.trace( MESSAGE );
103103

104104
verify( delegate, never() ).trace( anyString(), anyVararg() );
@@ -108,7 +108,7 @@ public void shouldNotDelegateTraceLogWhenTraceDisabled()
108108
public void shouldDelegateErrorMessageWhenNoPrefix()
109109
{
110110
Logger delegate = newLoggerMock();
111-
DelegatingLogger logger = new DelegatingLogger( delegate );
111+
PrefixedLogger logger = new PrefixedLogger( delegate );
112112

113113
logger.error( MESSAGE, ERROR );
114114

@@ -119,7 +119,7 @@ public void shouldDelegateErrorMessageWhenNoPrefix()
119119
public void shouldDelegateInfoMessageWhenNoPrefix()
120120
{
121121
Logger delegate = newLoggerMock();
122-
DelegatingLogger logger = new DelegatingLogger( delegate );
122+
PrefixedLogger logger = new PrefixedLogger( delegate );
123123

124124
logger.info( MESSAGE );
125125

@@ -130,7 +130,7 @@ public void shouldDelegateInfoMessageWhenNoPrefix()
130130
public void shouldDelegateWarnMessageWhenNoPrefix()
131131
{
132132
Logger delegate = newLoggerMock();
133-
DelegatingLogger logger = new DelegatingLogger( delegate );
133+
PrefixedLogger logger = new PrefixedLogger( delegate );
134134

135135
logger.warn( MESSAGE );
136136

@@ -141,7 +141,7 @@ public void shouldDelegateWarnMessageWhenNoPrefix()
141141
public void shouldDelegateWarnMessageWithoutErrorWhenNoPrefix()
142142
{
143143
Logger delegate = newLoggerMock();
144-
DelegatingLogger logger = new DelegatingLogger( delegate );
144+
PrefixedLogger logger = new PrefixedLogger( delegate );
145145

146146
Exception cause = new Exception();
147147
logger.warn( MESSAGE, cause );
@@ -153,7 +153,7 @@ public void shouldDelegateWarnMessageWithoutErrorWhenNoPrefix()
153153
public void shouldDelegateDebugMessageWhenNoPrefix()
154154
{
155155
Logger delegate = newLoggerMock( true, false );
156-
DelegatingLogger logger = new DelegatingLogger( delegate );
156+
PrefixedLogger logger = new PrefixedLogger( delegate );
157157

158158
logger.debug( MESSAGE );
159159

@@ -164,7 +164,7 @@ public void shouldDelegateDebugMessageWhenNoPrefix()
164164
public void shouldDelegateTraceMessageWhenNoPrefix()
165165
{
166166
Logger delegate = newLoggerMock( false, true );
167-
DelegatingLogger logger = new DelegatingLogger( delegate );
167+
PrefixedLogger logger = new PrefixedLogger( delegate );
168168

169169
logger.trace( MESSAGE );
170170

@@ -175,7 +175,7 @@ public void shouldDelegateTraceMessageWhenNoPrefix()
175175
public void shouldDelegateErrorMessageWithPrefix()
176176
{
177177
Logger delegate = newLoggerMock();
178-
DelegatingLogger logger = new DelegatingLogger( PREFIX, delegate );
178+
PrefixedLogger logger = new PrefixedLogger( PREFIX, delegate );
179179

180180
logger.error( MESSAGE, ERROR );
181181

@@ -186,7 +186,7 @@ public void shouldDelegateErrorMessageWithPrefix()
186186
public void shouldDelegateInfoMessageWithPrefix()
187187
{
188188
Logger delegate = newLoggerMock();
189-
DelegatingLogger logger = new DelegatingLogger( PREFIX, delegate );
189+
PrefixedLogger logger = new PrefixedLogger( PREFIX, delegate );
190190

191191
logger.info( MESSAGE );
192192

@@ -197,7 +197,7 @@ public void shouldDelegateInfoMessageWithPrefix()
197197
public void shouldDelegateWarnMessageWithPrefix()
198198
{
199199
Logger delegate = newLoggerMock();
200-
DelegatingLogger logger = new DelegatingLogger( PREFIX, delegate );
200+
PrefixedLogger logger = new PrefixedLogger( PREFIX, delegate );
201201

202202
logger.warn( MESSAGE );
203203

@@ -208,7 +208,7 @@ public void shouldDelegateWarnMessageWithPrefix()
208208
public void shouldDelegateWarnMessageWithErrorWithPrefix()
209209
{
210210
Logger delegate = newLoggerMock();
211-
DelegatingLogger logger = new DelegatingLogger( PREFIX, delegate );
211+
PrefixedLogger logger = new PrefixedLogger( PREFIX, delegate );
212212

213213
Exception cause = new Exception();
214214
logger.warn( MESSAGE, cause );
@@ -220,7 +220,7 @@ public void shouldDelegateWarnMessageWithErrorWithPrefix()
220220
public void shouldDelegateDebugMessageWithPrefix()
221221
{
222222
Logger delegate = newLoggerMock( true, false );
223-
DelegatingLogger logger = new DelegatingLogger( PREFIX, delegate );
223+
PrefixedLogger logger = new PrefixedLogger( PREFIX, delegate );
224224

225225
logger.debug( MESSAGE );
226226

@@ -231,7 +231,7 @@ public void shouldDelegateDebugMessageWithPrefix()
231231
public void shouldDelegateTraceMessageWithPrefix()
232232
{
233233
Logger delegate = newLoggerMock( false, true );
234-
DelegatingLogger logger = new DelegatingLogger( PREFIX, delegate );
234+
PrefixedLogger logger = new PrefixedLogger( PREFIX, delegate );
235235

236236
logger.trace( MESSAGE );
237237

0 commit comments

Comments
 (0)