S2AChannelPool returnChannel --> returnToPool name change.

rmehta19 · rmehta19 · commit 72630d8d23ef · 2024-04-29T13:29:25.000-07:00
diff --git a/s2a/src/main/java/io/grpc/s2a/channel/S2AChannelPool.java b/s2a/src/main/java/io/grpc/s2a/channel/S2AChannelPool.java
@@ -32,7 +32,7 @@ public interface S2AChannelPool extends AutoCloseable {
   Channel getChannel();
 
   /** Returns a channel to the channel pool. */
-  void returnChannel(Channel channel);
+  void returnToPool(Channel channel);
 
   /**
    * Returns all channels to the channel pool and closes the pool so that no new channels can be
diff --git a/s2a/src/main/java/io/grpc/s2a/channel/S2AGrpcChannelPool.java b/s2a/src/main/java/io/grpc/s2a/channel/S2AGrpcChannelPool.java
@@ -87,7 +87,7 @@ public synchronized Channel getChannel() {
    * <p>The caller must ensure that {@code channel} was retrieved from this channel pool.
    */
   @Override
-  public synchronized void returnChannel(Channel channel) {
+  public synchronized void returnToPool(Channel channel) {
     checkState(state.equals(State.OPEN), "Channel pool is not open.");
     checkArgument(
         cachedChannel != null && numberOfUsersOfCachedChannel > 0 && cachedChannel.equals(channel),
diff --git a/s2a/src/test/java/io/grpc/s2a/channel/S2AGrpcChannelPoolTest.java b/s2a/src/test/java/io/grpc/s2a/channel/S2AGrpcChannelPoolTest.java
@@ -43,34 +43,34 @@ public void getChannel_success() throws Exception {
   }
 
   @Test
-  public void returnChannel_success() throws Exception {
+  public void returnToPool_success() throws Exception {
     FakeChannelPool fakeChannelPool = new FakeChannelPool();
     S2AChannelPool s2aChannelPool = S2AGrpcChannelPool.create(fakeChannelPool);
 
-    s2aChannelPool.returnChannel(s2aChannelPool.getChannel());
+    s2aChannelPool.returnToPool(s2aChannelPool.getChannel());
 
     assertThat(fakeChannelPool.isChannelCached()).isFalse();
   }
 
   @Test
-  public void returnChannel_channelStillCachedBecauseMultipleChannelsRetrieved() throws Exception {
+  public void returnToPool_channelStillCachedBecauseMultipleChannelsRetrieved() throws Exception {
     FakeChannelPool fakeChannelPool = new FakeChannelPool();
     S2AChannelPool s2aChannelPool = S2AGrpcChannelPool.create(fakeChannelPool);
 
     s2aChannelPool.getChannel();
-    s2aChannelPool.returnChannel(s2aChannelPool.getChannel());
+    s2aChannelPool.returnToPool(s2aChannelPool.getChannel());
 
     assertThat(fakeChannelPool.isChannelCached()).isTrue();
   }
 
   @Test
-  public void returnChannel_failureBecauseChannelWasNotFromPool() throws Exception {
+  public void returnToPool_failureBecauseChannelWasNotFromPool() throws Exception {
     S2AChannelPool s2aChannelPool = S2AGrpcChannelPool.create(new FakeChannelPool());
 
     IllegalArgumentException expected =
         assertThrows(
             IllegalArgumentException.class,
-            () -> s2aChannelPool.returnChannel(mock(Channel.class)));
+            () -> s2aChannelPool.returnToPool(mock(Channel.class)));
     assertThat(expected)
         .hasMessageThat()
         .isEqualTo(
diff --git a/s2a/src/test/java/io/grpc/s2a/handshaker/S2AProtocolNegotiatorFactoryTest.java b/s2a/src/test/java/io/grpc/s2a/handshaker/S2AProtocolNegotiatorFactoryTest.java
@@ -187,7 +187,7 @@ public Channel getChannel() {
     }
 
     @Override
-    public void returnChannel(Channel channel) {}
+    public void returnToPool(Channel channel) {}
 
     @Override
     public void close() {}

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public Channel getChannel() {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`@Override`
`190`		`- public void returnChannel(Channel channel) {}`
	`190`	`+ public void returnToPool(Channel channel) {}`
`191`	`191`
`192`	`192`	`@Override`
`193`	`193`	`public void close() {}`