Skip to content

Commit c3272f2

Browse files
lutovichlutovich
committed
Renamed "passivate" to "deactivate"
1 parent 76be8f7 commit c3272f2

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎driver/src/main/java/org/neo4j/driver/internal/cluster/LoadBalancer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private synchronized void forget( BoltServerAddress address )
118118
}
119119
else
120120
{
121-
connections.passivate( address );
121+
connections.deactivate( address );
122122
}
123123
}
124124

@@ -159,7 +159,7 @@ private void updateConnectionPool( RoutingTableChange routingTableChange )
159159
}
160160
for ( BoltServerAddress removedAddress : routingTableChange.removed() )
161161
{
162-
connections.passivate( removedAddress );
162+
connections.deactivate( removedAddress );
163163
}
164164
connections.compact();
165165
}

‎driver/src/main/java/org/neo4j/driver/internal/net/pooling/BlockingPooledConnectionQueue.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class BlockingPooledConnectionQueue
4444
private final BlockingQueue<PooledConnection> queue;
4545
private final Logger logger;
4646

47-
private final AtomicBoolean isPassive = new AtomicBoolean( false );
47+
private final AtomicBoolean isDeactivated = new AtomicBoolean( false );
4848
private final AtomicBoolean isTerminating = new AtomicBoolean( false );
4949

5050
/** Keeps track of acquired connections */
@@ -72,7 +72,7 @@ public boolean offer( PooledConnection pooledConnection )
7272
{
7373
disposeSafely( pooledConnection );
7474
}
75-
if ( isPassive.get() || isTerminating.get() )
75+
if ( isDeactivated.get() || isTerminating.get() )
7676
{
7777
terminateIdleConnections();
7878
}
@@ -93,11 +93,11 @@ public PooledConnection acquire( Supplier<PooledConnection> supplier )
9393
}
9494
acquiredConnections.add( connection );
9595

96-
if ( isPassive.get() || isTerminating.get() )
96+
if ( isDeactivated.get() || isTerminating.get() )
9797
{
9898
acquiredConnections.remove( connection );
9999
disposeSafely( connection );
100-
throw new IllegalStateException( "Pool is " + (isPassive.get() ? "passivated" : "terminated") + ", " +
100+
throw new IllegalStateException( "Pool is " + (isDeactivated.get() ? "deactivated" : "terminated") + ", " +
101101
"new connections can't be acquired" );
102102
}
103103
else
@@ -129,20 +129,20 @@ public boolean contains( PooledConnection pooledConnection )
129129

130130
public void activate()
131131
{
132-
isPassive.compareAndSet( true, false );
132+
isDeactivated.compareAndSet( true, false );
133133
}
134134

135-
public void passivate()
135+
public void deactivate()
136136
{
137-
if ( isPassive.compareAndSet( false, true ) )
137+
if ( isDeactivated.compareAndSet( false, true ) )
138138
{
139139
terminateIdleConnections();
140140
}
141141
}
142142

143143
public boolean isActive()
144144
{
145-
return !isPassive.get();
145+
return !isDeactivated.get();
146146
}
147147

148148
/**

‎driver/src/main/java/org/neo4j/driver/internal/net/pooling/SocketConnectionPool.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ public void activate( BoltServerAddress address )
103103
}
104104

105105
@Override
106-
public void passivate( BoltServerAddress address )
106+
public void deactivate( BoltServerAddress address )
107107
{
108108
BlockingPooledConnectionQueue connections = pools.get( address );
109109
if ( connections != null )
110110
{
111-
connections.passivate();
111+
connections.deactivate();
112112
}
113113
}
114114

@@ -122,7 +122,7 @@ public void compact()
122122

123123
if ( !queue.isActive() && queue.activeConnections() == 0 )
124124
{
125-
// queue has been in passive state and has no open connections by now
125+
// queue has been in deactivated state and has no open connections by now
126126
pools.remove( address );
127127
}
128128
}

‎driver/src/main/java/org/neo4j/driver/internal/spi/ConnectionPool.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public interface ConnectionPool extends AutoCloseable
3838

3939
void activate( BoltServerAddress address );
4040

41-
void passivate( BoltServerAddress address );
41+
void deactivate( BoltServerAddress address );
4242

4343
void compact();
4444

‎driver/src/test/java/org/neo4j/driver/internal/cluster/LoadBalancerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
public class LoadBalancerTest
7272
{
7373
@Test
74-
public void ensureRoutingShouldUpdateRoutingTableAndPassivateConnectionPoolWhenStale() throws Exception
74+
public void ensureRoutingShouldUpdateRoutingTableAndDeactivateConnectionPoolWhenStale() throws Exception
7575
{
7676
// given
7777
ConnectionPool conns = mock( ConnectionPool.class );
@@ -89,7 +89,7 @@ public void ensureRoutingShouldUpdateRoutingTableAndPassivateConnectionPoolWhenS
8989
InOrder inOrder = inOrder( rediscovery, routingTable, conns );
9090
inOrder.verify( rediscovery ).lookupClusterComposition( routingTable, conns );
9191
inOrder.verify( routingTable ).update( any( ClusterComposition.class ) );
92-
inOrder.verify( conns ).passivate( new BoltServerAddress( "abc", 12 ) );
92+
inOrder.verify( conns ).deactivate( new BoltServerAddress( "abc", 12 ) );
9393
}
9494

9595
@Test
@@ -172,7 +172,7 @@ public void shouldForgetAddressAndItsConnectionsOnServiceUnavailableWhileClosing
172172
}
173173

174174
verify( routingTable ).forget( address );
175-
verify( connectionPool ).passivate( address );
175+
verify( connectionPool ).deactivate( address );
176176
}
177177

178178
@Test
@@ -193,7 +193,7 @@ public void shouldForgetAddressAndItsIdleConnectionsOnServiceUnavailableWhileClo
193193
session.close();
194194

195195
verify( routingTable ).forget( address );
196-
verify( connectionPool ).passivate( address );
196+
verify( connectionPool ).deactivate( address );
197197
}
198198

199199
@Test

‎driver/src/test/java/org/neo4j/driver/internal/net/pooling/BlockingPooledConnectionQueueTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -302,12 +302,12 @@ public void shouldDisposeBrokenConnections()
302302
}
303303

304304
@Test
305-
public void shouldFailToAcquireConnectionWhenPassive()
305+
public void shouldFailToAcquireConnectionWhenDeactivated()
306306
{
307307
Supplier<PooledConnection> connectionSupplier = connectionSupplierMock();
308308
when( connectionSupplier.get() ).thenReturn( mock( PooledConnection.class ) );
309309
BlockingPooledConnectionQueue queue = newConnectionQueue( 3 );
310-
queue.passivate();
310+
queue.deactivate();
311311

312312
try
313313
{
@@ -316,15 +316,15 @@ public void shouldFailToAcquireConnectionWhenPassive()
316316
}
317317
catch ( IllegalStateException e )
318318
{
319-
assertThat( e.getMessage(), startsWith( "Pool is passivated" ) );
319+
assertThat( e.getMessage(), startsWith( "Pool is deactivated" ) );
320320
}
321321
}
322322

323323
@Test
324-
public void shouldTerminateOfferedConnectionWhenPassive()
324+
public void shouldTerminateOfferedConnectionWhenDeactivated()
325325
{
326326
BlockingPooledConnectionQueue queue = newConnectionQueue( 3 );
327-
queue.passivate();
327+
queue.deactivate();
328328

329329
PooledConnection connection = mock( PooledConnection.class );
330330
queue.offer( connection );
@@ -337,7 +337,7 @@ public void shouldReportWhenActive()
337337
{
338338
BlockingPooledConnectionQueue queue = newConnectionQueue( 1 );
339339
assertTrue( queue.isActive() );
340-
queue.passivate();
340+
queue.deactivate();
341341
assertFalse( queue.isActive() );
342342
}
343343

‎driver/src/test/java/org/neo4j/driver/internal/net/pooling/SocketConnectionPoolTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,33 +111,33 @@ public void acquireUsesExistingConnectionIfPresent()
111111
}
112112

113113
@Test
114-
public void passivateDoesNothingForNonExistingAddress()
114+
public void deactivateDoesNothingForNonExistingAddress()
115115
{
116116
Connection connection = newConnectionMock( ADDRESS_1 );
117117
SocketConnectionPool pool = newPool( newMockConnector( connection ) );
118118

119119
pool.acquire( ADDRESS_1 ).close();
120120

121121
assertTrue( pool.hasAddress( ADDRESS_1 ) );
122-
pool.passivate( ADDRESS_2 );
122+
pool.deactivate( ADDRESS_2 );
123123
assertTrue( pool.hasAddress( ADDRESS_1 ) );
124124
}
125125

126126
@Test
127-
public void passivateRemovesAddress()
127+
public void deactivateRemovesAddress()
128128
{
129129
Connection connection = newConnectionMock( ADDRESS_1 );
130130
SocketConnectionPool pool = newPool( newMockConnector( connection ) );
131131

132132
pool.acquire( ADDRESS_1 ).close();
133133

134134
assertTrue( pool.hasAddress( ADDRESS_1 ) );
135-
pool.passivate( ADDRESS_1 );
135+
pool.deactivate( ADDRESS_1 );
136136
assertFalse( pool.hasAddress( ADDRESS_1 ) );
137137
}
138138

139139
@Test
140-
public void passivateTerminatesIdleConnectionsInThePoolCorrespondingToTheAddress()
140+
public void deactivateTerminatesIdleConnectionsInThePoolCorrespondingToTheAddress()
141141
{
142142
Connection connection1 = newConnectionMock( ADDRESS_1 );
143143
Connection connection2 = newConnectionMock( ADDRESS_1 );
@@ -152,7 +152,7 @@ public void passivateTerminatesIdleConnectionsInThePoolCorrespondingToTheAddress
152152
pooledConnection1.close();
153153
pooledConnection2.close();
154154

155-
pool.passivate( ADDRESS_1 );
155+
pool.deactivate( ADDRESS_1 );
156156

157157
verify( connection1 ).close();
158158
verify( connection2 ).close();
@@ -591,28 +591,28 @@ public void shouldForgetIdleConnection()
591591
}
592592

593593
@Test
594-
public void shouldPassivateExistingPool()
594+
public void shouldDeactivateExistingPool()
595595
{
596596
SocketConnectionPool pool = newPool( newMockConnector() );
597597

598598
assertNotNull( pool.acquire( ADDRESS_1 ) );
599599
assertTrue( pool.hasAddress( ADDRESS_1 ) );
600600
assertEquals( 1, pool.activeConnections( ADDRESS_1 ) );
601601

602-
pool.passivate( ADDRESS_1 );
602+
pool.deactivate( ADDRESS_1 );
603603
assertFalse( pool.hasAddress( ADDRESS_1 ) );
604604
assertEquals( 0, pool.activeConnections( ADDRESS_1 ) );
605605
}
606606

607607
@Test
608-
public void shouldPassivateNothingWhenPoolDoesNotExist()
608+
public void shouldDeactivateNothingWhenPoolDoesNotExist()
609609
{
610610
SocketConnectionPool pool = newPool( newMockConnector() );
611611

612612
assertFalse( pool.hasAddress( ADDRESS_1 ) );
613613
assertEquals( 0, pool.activeConnections( ADDRESS_1 ) );
614614

615-
pool.passivate( ADDRESS_1 );
615+
pool.deactivate( ADDRESS_1 );
616616

617617
assertFalse( pool.hasAddress( ADDRESS_1 ) );
618618
assertEquals( 0, pool.activeConnections( ADDRESS_1 ) );
@@ -624,7 +624,7 @@ public void shouldActivateExistingPool()
624624
SocketConnectionPool pool = newPool( newMockConnector() );
625625
assertNotNull( pool.acquire( ADDRESS_1 ) );
626626

627-
pool.passivate( ADDRESS_1 );
627+
pool.deactivate( ADDRESS_1 );
628628
pool.activate( ADDRESS_1 );
629629

630630
assertTrue( pool.hasAddress( ADDRESS_1 ) );
@@ -646,7 +646,7 @@ public void shouldActivateNothingWhenPoolDoesNotExist()
646646
}
647647

648648
@Test
649-
public void shouldRemovePassivePoolsWithoutConnectionsWhenCompacting()
649+
public void shouldRemoveDeactivatedPoolsWithoutConnectionsWhenCompacting()
650650
{
651651
SocketConnectionPool pool = newPool( newMockConnector( newConnectionMock( ADDRESS_1 ),
652652
newConnectionMock( ADDRESS_1 ), newConnectionMock( ADDRESS_2 ), newConnectionMock( ADDRESS_3 ) ) );
@@ -658,8 +658,8 @@ public void shouldRemovePassivePoolsWithoutConnectionsWhenCompacting()
658658

659659
assertEquals( new HashSet<>( asList( ADDRESS_1, ADDRESS_2, ADDRESS_3 ) ), pool.addresses() );
660660

661-
pool.passivate( ADDRESS_1 );
662-
pool.passivate( ADDRESS_3 );
661+
pool.deactivate( ADDRESS_1 );
662+
pool.deactivate( ADDRESS_3 );
663663

664664
connection1.close();
665665
connection2.close();

0 commit comments

Comments
 (0)