Naming

Author: michaelklishin

src/main/java/com/rabbitmq/client/ConnectionFactory.java

@@ -965,7 +965,7 @@ public ConnectionParams params(ExecutorService consumerWorkServiceExecutor) {
         result.setShutdownExecutor(shutdownExecutor);
         result.setHeartbeatExecutor(heartbeatExecutor);
         result.setChannelRpcTimeout(channelRpcTimeout);
-        result.setChannelCheckRpcReplyType(channelCheckRpcReplyType);
+        result.setChannelShouldCheckRpcResponseType(channelCheckRpcReplyType);
         return result;
     }
 

src/main/java/com/rabbitmq/client/impl/AMQChannel.java

@@ -85,7 +85,7 @@ public AMQChannel(AMQConnection connection, int channelNumber) {
             throw new IllegalArgumentException("Continuation timeout on RPC calls cannot be less than 0");
         }
         this._rpcTimeout = connection.getChannelRpcTimeout();
-        this._checkRpcReplyType = connection.isChannelCheckRpcReplyType();
+        this._checkRpcReplyType = connection.willCheckRpcResponseType();
     }
 
     /**

src/main/java/com/rabbitmq/client/impl/AMQConnection.java

@@ -134,7 +134,7 @@ public static Map<String, Object> defaultClientProperties() {
     private final Collection<BlockedListener> blockedListeners = new CopyOnWriteArrayList<BlockedListener>();
     protected final MetricsCollector metricsCollector;
     private final int channelRpcTimeout;
-    private final boolean channelCheckRpcReplyType;
+    private final boolean channelShouldCheckRpcResponseType;
 
     /* State modified after start - all volatile */
 
@@ -230,7 +230,7 @@ public AMQConnection(ConnectionParams params, FrameHandler frameHandler, Metrics
             throw new IllegalArgumentException("Continuation timeout on RPC calls cannot be less than 0");
         }
         this.channelRpcTimeout = params.getChannelRpcTimeout();
-        this.channelCheckRpcReplyType = params.isChannelCheckRpcReplyType();
+        this.channelShouldCheckRpcResponseType = params.channelShouldCheckRpcResponseType();
 
         this._channel0 = new AMQChannel(this, 0) {
             @Override public boolean processAsync(Command c) throws IOException {
@@ -1059,7 +1059,7 @@ public int getChannelRpcTimeout() {
         return channelRpcTimeout;
     }
 
-    public boolean isChannelCheckRpcReplyType() {
-        return channelCheckRpcReplyType;
+    public boolean willCheckRpcResponseType() {
+        return channelShouldCheckRpcResponseType;
     }
 }

src/main/java/com/rabbitmq/client/impl/ConnectionParams.java

@@ -40,7 +40,7 @@ public class ConnectionParams {
     private long networkRecoveryInterval;
     private boolean topologyRecovery;
     private int channelRpcTimeout;
-    private boolean channelCheckRpcReplyType;
+    private boolean channelShouldCheckRpcResponseType;
 
     private ExceptionHandler exceptionHandler;
     private ThreadFactory threadFactory;
@@ -115,8 +115,8 @@ public int getChannelRpcTimeout() {
         return channelRpcTimeout;
     }
 
-    public boolean isChannelCheckRpcReplyType() {
-        return channelCheckRpcReplyType;
+    public boolean channelShouldCheckRpcResponseType() {
+        return channelShouldCheckRpcResponseType;
     }
 
     public void setUsername(String username) {
@@ -195,7 +195,7 @@ public void setChannelRpcTimeout(int channelRpcTimeout) {
         this.channelRpcTimeout = channelRpcTimeout;
     }
 
-    public void setChannelCheckRpcReplyType(boolean channelCheckRpcReplyType) {
-        this.channelCheckRpcReplyType = channelCheckRpcReplyType;
+    public void setChannelShouldCheckRpcResponseType(boolean channelShouldCheckRpcResponseType) {
+        this.channelShouldCheckRpcResponseType = channelShouldCheckRpcResponseType;
     }
 }

src/test/java/com/rabbitmq/client/test/AMQChannelTest.java

@@ -107,11 +107,11 @@ public Void call() throws Exception {
     }
 
     @Test
-    public void testRpcTimeout_replyComesDuringNexRpc() throws Exception {
+    public void testRpcTimeoutReplyComesDuringNexRpc() throws Exception {
         int rpcTimeout = 100;
         AMQConnection connection = mock(AMQConnection.class);
         when(connection.getChannelRpcTimeout()).thenReturn(rpcTimeout);
-        when(connection.isChannelCheckRpcReplyType()).thenReturn(Boolean.TRUE);
+        when(connection.willCheckRpcResponseType()).thenReturn(Boolean.TRUE);
 
         final DummyAmqChannel channel = new DummyAmqChannel(connection, 1);
         Method method = new AMQImpl.Queue.Declare.Builder()