renaming

Author: VolkodamovDaniil

modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java

@@ -230,16 +230,16 @@ public ClientConfiguration setTcpNoDelay(boolean tcpNoDelay) {
     }
 
     /**
-     * @deprecated Use {@link #getConnTimeout()} and {@link #getReqTimeout()} instead.
+     * @deprecated Use {@link #getConnectionTimeout()} and {@link #getRequestTimeout()} instead.
      * @return Send/receive timeout in milliseconds.
      */
     @Deprecated
     public int getTimeout() {
-        return Math.max(connTimeout, reqTimeout);
+        return reqTimeout;
     }
 
     /**
-     * @deprecated Use {@link #setConnTimeout(int)} and {@link #setReqTimeout(int)} instead.
+     * @deprecated Use {@link #setConnectionTimeout(int)} and {@link #setRequestTimeout(int)} instead.
      * @param timeout Send/receive timeout in milliseconds.
      * @return {@code this} for chaining.
      */
@@ -253,31 +253,31 @@ public ClientConfiguration setTimeout(int timeout) {
     /**
      * @return Connection timeout in milliseconds. 0 means infinite.
      */
-    public int getConnTimeout() {
+    public int getConnectionTimeout() {
         return connTimeout;
     }
 
     /**
      * @param connTimeout Connection timeout in milliseconds. 0 means infinite.
      * @return {@code this} for chaining.
      */
-    public ClientConfiguration setConnTimeout(int connTimeout) {
+    public ClientConfiguration setConnectionTimeout(int connTimeout) {
         this.connTimeout = connTimeout;
         return this;
     }
 
     /**
      * @return Request timeout in milliseconds. 0 means infinite.
      */
-    public int getReqTimeout() {
+    public int getRequestTimeout() {
         return reqTimeout;
     }
 
     /**
      * @param reqTimeout Request timeout in milliseconds. 0 means infinite.
      * @return {@code this} for chaining.
      */
-    public ClientConfiguration setReqTimeout(int reqTimeout) {
+    public ClientConfiguration setRequestTimeout(int reqTimeout) {
         this.reqTimeout = reqTimeout;
         return this;
     }

modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientChannelConfiguration.java

@@ -126,8 +126,8 @@ final class ClientChannelConfiguration {
     ClientChannelConfiguration(ClientConfiguration cfg, List<InetSocketAddress> addrs) {
         this.sslMode = cfg.getSslMode();
         this.tcpNoDelay = cfg.isTcpNoDelay();
-        this.connTimeout = cfg.getConnTimeout();
-        this.reqTimeout = cfg.getReqTimeout();
+        this.connTimeout = cfg.getConnectionTimeout();
+        this.reqTimeout = cfg.getRequestTimeout();
         this.sndBufSize = cfg.getSendBufferSize();
         this.rcvBufSize = cfg.getReceiveBufferSize();
         this.sslClientCertKeyStorePath = cfg.getSslClientCertificateKeyStorePath();
@@ -176,25 +176,25 @@ public boolean isTcpNoDelay() {
     }
 
     /**
-     * @deprecated Use {@link #getConnTimeout()} and {@link #getReqTimeout()} instead.
+     * @deprecated Use {@link #getConnectionTimeout()} and {@link #getRequestTimeout()} instead.
      * @return Timeout.
      */
     @Deprecated
     public int getTimeout() {
-        return Math.max(connTimeout, reqTimeout);
+        return reqTimeout;
     }
 
     /**
      * @return Connection timeout.
      */
-    public int getConnTimeout() {
+    public int getConnectionTimeout() {
         return connTimeout;
     }
 
     /**
      * @return Request timeout.
      */
-    public int getReqTimeout() {
+    public int getRequestTimeout() {
         return reqTimeout;
     }
 

modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java

@@ -198,8 +198,8 @@ class TcpClientChannel implements ClientChannel, ClientMessageHandler, ClientCon
         Executor cfgExec = cfg.getAsyncContinuationExecutor();
         asyncContinuationExecutor = cfgExec != null ? cfgExec : ForkJoinPool.commonPool();
 
-        connTimeout = cfg.getConnTimeout();
-        reqTimeout = cfg.getReqTimeout();
+        connTimeout = cfg.getConnectionTimeout();
+        reqTimeout = cfg.getRequestTimeout();
 
         List<InetSocketAddress> addrs = cfg.getAddresses();
 

modules/core/src/main/java/org/apache/ignite/internal/client/thin/io/gridnioserver/GridNioClientConnectionMultiplexer.java

@@ -89,7 +89,7 @@ public GridNioClientConnectionMultiplexer(ClientConfiguration cfg) {
         else
             filters = new GridNioFilter[] {codecFilter};
 
-        connTimeout = cfg.getConnTimeout();
+        connTimeout = cfg.getConnectionTimeout();
 
         try {
             srv = GridNioServer.<ByteBuffer>builder()

modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java

@@ -59,8 +59,8 @@ public class ClientConfigurationTest {
     public void testSerialization() throws IOException, ClassNotFoundException {
         ClientConfiguration target = new ClientConfiguration()
             .setAddresses("127.0.0.1:10800", "127.0.0.1:10801")
-            .setConnTimeout(123)
-            .setReqTimeout(123)
+            .setConnectionTimeout(123)
+            .setRequestTimeout(123)
             .setBinaryConfiguration(new BinaryConfiguration()
                 .setClassNames(Collections.singleton("Person"))
             )

modules/core/src/test/java/org/apache/ignite/client/Comparers.java

@@ -36,8 +36,8 @@ public static boolean equal(ClientConfiguration a, Object o) {
 
         return Arrays.equals(a.getAddresses(), b.getAddresses()) &&
             a.isTcpNoDelay() == b.isTcpNoDelay() &&
-            a.getConnTimeout() == b.getConnTimeout() &&
-            a.getReqTimeout() == b.getReqTimeout() &&
+            a.getConnectionTimeout() == b.getConnectionTimeout() &&
+            a.getRequestTimeout() == b.getRequestTimeout() &&
             a.getSendBufferSize() == b.getSendBufferSize() &&
             a.getReceiveBufferSize() == b.getReceiveBufferSize();
     }

modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientEnpointsDiscoveryTest.java

@@ -158,8 +158,8 @@ public void testUnreachableAddressDiscoveredDoesNotPreventClientInit() throws Ex
             // Config has good server address, client discovery returns unreachable address.
             // We expect the client to connect to the good address and ignore the unreachable one.
             ClientConfiguration ccfg = new ClientConfiguration()
-                    .setConnTimeout(2000)
-                    .setReqTimeout(2000)
+                    .setConnectionTimeout(2000)
+                    .setRequestTimeout(2000)
                     .setAddresses("127.0.0.1:" + DFLT_PORT);
 
             IgniteClient client = Ignition.startClient(ccfg);

modules/core/src/test/java/org/apache/ignite/internal/client/thin/TimeoutTest.java

@@ -67,7 +67,7 @@ public class TimeoutTest extends AbstractThinClientTest {
 
     /** {@inheritDoc} */
     @Override protected ClientConfiguration getClientConfiguration() {
-        return super.getClientConfiguration().setConnTimeout(TIMEOUT).setReqTimeout(TIMEOUT);
+        return super.getClientConfiguration().setConnectionTimeout(TIMEOUT).setRequestTimeout(TIMEOUT);
     }
 
     /**

modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/ClientSessionOutboundQueueLimitTest.java

@@ -68,8 +68,8 @@ public void testClientSessionOutboundQueueLimit() throws Exception {
         try (
             IgniteClient cli = Ignition.startClient(new ClientConfiguration()
                 .setAddresses("127.0.0.1:10800")
-                .setConnTimeout(5000) // Server will drop packets intended for the client. So client can hang on handshake during reconnect.
-                .setReqTimeout(5000)
+                .setConnectionTimeout(5000) // Server will drop packets intended for the client. So client can hang on handshake during reconnect.
+                .setRequestTimeout(5000)
                 .setRetryLimit(1) // Let's not retry operations if the channel was closed while waiting for a response.
                 .setEventListeners(new ConnectionEventListener() {
                     @Override public void onConnectionClosed(ConnectionClosedEvent event) {