Skip to content

Commit 705daf9

Browse files
lutovichlutovich
committed
Improve method name in InboundMessageDispatcher
1 parent 3da33db commit 705daf9

File tree

8 files changed

+34
-34
lines changed

8 files changed

+34
-34
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void operationComplete( ChannelFuture future )
5656
InitMessage message = new InitMessage( userAgent, authToken );
5757
InitResponseHandler handler = new InitResponseHandler( connectionInitializedPromise );
5858

59-
messageDispatcher( channel ).queue( handler );
59+
messageDispatcher( channel ).enqueue( handler );
6060
channel.writeAndFlush( message, channel.voidPromise() );
6161
}
6262
else

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ private void writeMessagesInEventLoop( Message message1, ResponseHandler handler
199199
private void writeMessages( Message message1, ResponseHandler handler1, Message message2, ResponseHandler handler2,
200200
boolean flush )
201201
{
202-
messageDispatcher.queue( handler1 );
203-
messageDispatcher.queue( handler2 );
202+
messageDispatcher.enqueue( handler1 );
203+
messageDispatcher.enqueue( handler2 );
204204

205205
channel.write( message1, channel.voidPromise() );
206206

@@ -216,7 +216,7 @@ private void writeMessages( Message message1, ResponseHandler handler1, Message
216216

217217
private void writeAndFlushMessage( Message message, ResponseHandler handler )
218218
{
219-
messageDispatcher.queue( handler );
219+
messageDispatcher.enqueue( handler );
220220
channel.writeAndFlush( message, channel.voidPromise() );
221221
}
222222

‎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
@@ -54,7 +54,7 @@ public InboundMessageDispatcher( Channel channel, Logging logging )
5454
this.log = new ChannelActivityLogger( channel, logging, getClass() );
5555
}
5656

57-
public void queue( ResponseHandler handler )
57+
public void enqueue( ResponseHandler handler )
5858
{
5959
if ( fatalErrorOccurred )
6060
{
@@ -245,7 +245,7 @@ private void ackFailureIfNeeded()
245245
{
246246
if ( !ackFailureMuted )
247247
{
248-
queue( new AckFailureResponseHandler( this ) );
248+
enqueue( new AckFailureResponseHandler( this ) );
249249
channel.writeAndFlush( ACK_FAILURE, channel.voidPromise() );
250250
}
251251
}

‎driver/src/main/java/org/neo4j/driver/internal/async/pool/NettyChannelHealthChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private boolean hasBeenIdleForTooLong( Channel channel )
103103
private Future<Boolean> ping( Channel channel )
104104
{
105105
Promise<Boolean> result = channel.eventLoop().newPromise();
106-
messageDispatcher( channel ).queue( new PingResponseHandler( result, channel, log ) );
106+
messageDispatcher( channel ).enqueue( new PingResponseHandler( result, channel, log ) );
107107
channel.writeAndFlush( ResetMessage.RESET, channel.voidPromise() );
108108
return result;
109109
}

‎driver/src/test/java/org/neo4j/driver/internal/async/HandshakeCompletedListenerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void shouldWriteInitMessageWhenHandshakeCompleted()
9494
listener.operationComplete( handshakeCompletedPromise );
9595
assertTrue( channel.finish() );
9696

97-
verify( messageDispatcher ).queue( any( InitResponseHandler.class ) );
97+
verify( messageDispatcher ).enqueue( any( InitResponseHandler.class ) );
9898
Object outboundMessage = channel.readOutbound();
9999
assertThat( outboundMessage, instanceOf( InitMessage.class ) );
100100
InitMessage initMessage = (InitMessage) outboundMessage;

‎driver/src/test/java/org/neo4j/driver/internal/async/NettyConnectionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,10 +521,10 @@ private static class ThreadTrackingInboundMessageDispatcher extends InboundMessa
521521
}
522522

523523
@Override
524-
public void queue( ResponseHandler handler )
524+
public void enqueue( ResponseHandler handler )
525525
{
526526
queueThreadNames.add( Thread.currentThread().getName() );
527-
super.queue( handler );
527+
super.enqueue( handler );
528528
}
529529

530530
}

‎driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageDispatcherTest.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void shouldDequeHandlerOnSuccess()
9292
InboundMessageDispatcher dispatcher = newDispatcher();
9393

9494
ResponseHandler handler = mock( ResponseHandler.class );
95-
dispatcher.queue( handler );
95+
dispatcher.enqueue( handler );
9696
assertEquals( 1, dispatcher.queuedHandlersCount() );
9797

9898
Map<String,Value> metadata = new HashMap<>();
@@ -110,7 +110,7 @@ public void shouldDequeHandlerOnFailure()
110110
InboundMessageDispatcher dispatcher = newDispatcher();
111111

112112
ResponseHandler handler = mock( ResponseHandler.class );
113-
dispatcher.queue( handler );
113+
dispatcher.enqueue( handler );
114114
assertEquals( 1, dispatcher.queuedHandlersCount() );
115115

116116
dispatcher.handleFailureMessage( FAILURE_CODE, FAILURE_MESSAGE );
@@ -128,7 +128,7 @@ public void shouldSendAckFailureOnFailure()
128128
Channel channel = mock( Channel.class );
129129
InboundMessageDispatcher dispatcher = newDispatcher( channel );
130130

131-
dispatcher.queue( mock( ResponseHandler.class ) );
131+
dispatcher.enqueue( mock( ResponseHandler.class ) );
132132
assertEquals( 1, dispatcher.queuedHandlersCount() );
133133

134134
dispatcher.handleFailureMessage( FAILURE_CODE, FAILURE_MESSAGE );
@@ -143,7 +143,7 @@ public void shouldNotSendAckFailureOnFailureWhenMuted()
143143
InboundMessageDispatcher dispatcher = newDispatcher( channel );
144144
dispatcher.muteAckFailure();
145145

146-
dispatcher.queue( mock( ResponseHandler.class ) );
146+
dispatcher.enqueue( mock( ResponseHandler.class ) );
147147
assertEquals( 1, dispatcher.queuedHandlersCount() );
148148

149149
dispatcher.handleFailureMessage( FAILURE_CODE, FAILURE_MESSAGE );
@@ -159,7 +159,7 @@ public void shouldUnMuteAckFailureWhenNotMuted()
159159

160160
dispatcher.unMuteAckFailure();
161161

162-
dispatcher.queue( mock( ResponseHandler.class ) );
162+
dispatcher.enqueue( mock( ResponseHandler.class ) );
163163
assertEquals( 1, dispatcher.queuedHandlersCount() );
164164

165165
dispatcher.handleFailureMessage( FAILURE_CODE, FAILURE_MESSAGE );
@@ -173,15 +173,15 @@ public void shouldSendAckFailureAfterUnMute()
173173
InboundMessageDispatcher dispatcher = newDispatcher( channel );
174174
dispatcher.muteAckFailure();
175175

176-
dispatcher.queue( mock( ResponseHandler.class ) );
176+
dispatcher.enqueue( mock( ResponseHandler.class ) );
177177
assertEquals( 1, dispatcher.queuedHandlersCount() );
178178

179179
dispatcher.handleFailureMessage( FAILURE_CODE, FAILURE_MESSAGE );
180180
verify( channel, never() ).writeAndFlush( eq( ACK_FAILURE ), any() );
181181

182182
dispatcher.unMuteAckFailure();
183183

184-
dispatcher.queue( mock( ResponseHandler.class ) );
184+
dispatcher.enqueue( mock( ResponseHandler.class ) );
185185
assertEquals( 1, dispatcher.queuedHandlersCount() );
186186

187187
dispatcher.handleFailureMessage( FAILURE_CODE, FAILURE_MESSAGE );
@@ -193,7 +193,7 @@ public void shouldClearFailureOnAckFailureSuccess()
193193
{
194194
InboundMessageDispatcher dispatcher = newDispatcher();
195195

196-
dispatcher.queue( mock( ResponseHandler.class ) );
196+
dispatcher.enqueue( mock( ResponseHandler.class ) );
197197
assertEquals( 1, dispatcher.queuedHandlersCount() );
198198

199199
dispatcher.handleFailureMessage( FAILURE_CODE, FAILURE_MESSAGE );
@@ -208,7 +208,7 @@ public void shouldPeekHandlerOnRecord()
208208
InboundMessageDispatcher dispatcher = newDispatcher();
209209

210210
ResponseHandler handler = mock( ResponseHandler.class );
211-
dispatcher.queue( handler );
211+
dispatcher.enqueue( handler );
212212
assertEquals( 1, dispatcher.queuedHandlersCount() );
213213

214214
Value[] fields1 = {new IntegerValue( 1 )};
@@ -234,9 +234,9 @@ public void shouldFailAllHandlersOnFatalError()
234234
ResponseHandler handler2 = mock( ResponseHandler.class );
235235
ResponseHandler handler3 = mock( ResponseHandler.class );
236236

237-
dispatcher.queue( handler1 );
238-
dispatcher.queue( handler2 );
239-
dispatcher.queue( handler3 );
237+
dispatcher.enqueue( handler1 );
238+
dispatcher.enqueue( handler2 );
239+
dispatcher.enqueue( handler3 );
240240

241241
RuntimeException fatalError = new RuntimeException( "Fatal!" );
242242
dispatcher.handleFatalError( fatalError );
@@ -256,7 +256,7 @@ public void shouldFailNewHandlerAfterFatalError()
256256
dispatcher.handleFatalError( fatalError );
257257

258258
ResponseHandler handler = mock( ResponseHandler.class );
259-
dispatcher.queue( handler );
259+
dispatcher.enqueue( handler );
260260

261261
verify( handler ).onFailure( fatalError );
262262
}
@@ -267,7 +267,7 @@ public void shouldDequeHandlerOnIgnored()
267267
InboundMessageDispatcher dispatcher = newDispatcher();
268268
ResponseHandler handler = mock( ResponseHandler.class );
269269

270-
dispatcher.queue( handler );
270+
dispatcher.enqueue( handler );
271271
dispatcher.handleIgnoredMessage();
272272

273273
assertEquals( 0, dispatcher.queuedHandlersCount() );
@@ -280,8 +280,8 @@ public void shouldFailHandlerOnIgnoredMessageWithExistingError()
280280
ResponseHandler handler1 = mock( ResponseHandler.class );
281281
ResponseHandler handler2 = mock( ResponseHandler.class );
282282

283-
dispatcher.queue( handler1 );
284-
dispatcher.queue( handler2 );
283+
dispatcher.enqueue( handler1 );
284+
dispatcher.enqueue( handler2 );
285285

286286
dispatcher.handleFailureMessage( FAILURE_CODE, FAILURE_MESSAGE );
287287
verifyFailure( handler1 );
@@ -296,7 +296,7 @@ public void shouldFailHandlerOnIgnoredMessageWhenHandlingReset()
296296
{
297297
InboundMessageDispatcher dispatcher = newDispatcher();
298298
ResponseHandler handler = mock( ResponseHandler.class );
299-
dispatcher.queue( handler );
299+
dispatcher.enqueue( handler );
300300

301301
dispatcher.muteAckFailure();
302302
dispatcher.handleIgnoredMessage();
@@ -309,7 +309,7 @@ public void shouldFailHandlerOnIgnoredMessageWhenNoErrorAndNotHandlingReset()
309309
{
310310
InboundMessageDispatcher dispatcher = newDispatcher();
311311
ResponseHandler handler = mock( ResponseHandler.class );
312-
dispatcher.queue( handler );
312+
dispatcher.enqueue( handler );
313313

314314
dispatcher.handleIgnoredMessage();
315315

@@ -323,8 +323,8 @@ public void shouldDequeAndFailHandlerOnIgnoredWhenErrorHappened()
323323
ResponseHandler handler1 = mock( ResponseHandler.class );
324324
ResponseHandler handler2 = mock( ResponseHandler.class );
325325

326-
dispatcher.queue( handler1 );
327-
dispatcher.queue( handler2 );
326+
dispatcher.enqueue( handler1 );
327+
dispatcher.enqueue( handler2 );
328328
dispatcher.handleFailureMessage( FAILURE_CODE, FAILURE_MESSAGE );
329329
dispatcher.handleIgnoredMessage();
330330

‎driver/src/test/java/org/neo4j/driver/internal/async/inbound/InboundMessageHandlerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void tearDown()
8686
public void shouldReadSuccessMessage()
8787
{
8888
ResponseHandler responseHandler = mock( ResponseHandler.class );
89-
messageDispatcher.queue( responseHandler );
89+
messageDispatcher.enqueue( responseHandler );
9090

9191
Map<String,Value> metadata = new HashMap<>();
9292
metadata.put( "key1", value( 1 ) );
@@ -100,7 +100,7 @@ public void shouldReadSuccessMessage()
100100
public void shouldReadFailureMessage()
101101
{
102102
ResponseHandler responseHandler = mock( ResponseHandler.class );
103-
messageDispatcher.queue( responseHandler );
103+
messageDispatcher.enqueue( responseHandler );
104104

105105
channel.writeInbound( writer.asByteBuf( new FailureMessage( "Neo.TransientError.General.ReadOnly", "Hi!" ) ) );
106106

@@ -114,7 +114,7 @@ public void shouldReadFailureMessage()
114114
public void shouldReadRecordMessage()
115115
{
116116
ResponseHandler responseHandler = mock( ResponseHandler.class );
117-
messageDispatcher.queue( responseHandler );
117+
messageDispatcher.enqueue( responseHandler );
118118

119119
Value[] fields = {value( 1 ), value( 2 ), value( 3 )};
120120
channel.writeInbound( writer.asByteBuf( new RecordMessage( fields ) ) );
@@ -126,7 +126,7 @@ public void shouldReadRecordMessage()
126126
public void shouldReadIgnoredMessage()
127127
{
128128
ResponseHandler responseHandler = mock( ResponseHandler.class );
129-
messageDispatcher.queue( responseHandler );
129+
messageDispatcher.enqueue( responseHandler );
130130

131131
channel.writeInbound( writer.asByteBuf( new IgnoredMessage() ) );
132132
assertEquals( 0, messageDispatcher.queuedHandlersCount() );

0 commit comments

Comments
 (0)