fix mocks in broken tests

Author: ndimiduk

hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.java

@@ -100,13 +100,9 @@ public static RpcRetryingCallerFactory instantiate(Configuration configuration,
     if (rpcCallerFactoryClazz.equals(clazzName)) {
       factory = new RpcRetryingCallerFactory(configuration, connectionConf, interceptor, metrics);
     } else {
-      try {
-        factory = ReflectionUtils.instantiateWithCustomCtor(rpcCallerFactoryClazz,
-          new Class[] { Configuration.class }, new Object[] { configuration, connectionConf });
-      } catch (UnsupportedOperationException e) {
-        factory = ReflectionUtils.instantiateWithCustomCtor(rpcCallerFactoryClazz,
-          new Class[] { Configuration.class }, new Object[] { configuration });
-      }
+      factory = ReflectionUtils.instantiateWithCustomCtor(rpcCallerFactoryClazz,
+        new Class[] { Configuration.class, ConnectionConfiguration.class },
+        new Object[] { configuration, connectionConf });
     }
     return factory;
   }

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientScanner.java

@@ -89,6 +89,7 @@ public void setup() throws IOException {
     conf = new Configuration();
     connectionConfig = new ConnectionConfiguration(conf);
     Mockito.when(clusterConn.getConfiguration()).thenReturn(conf);
+    Mockito.when(clusterConn.getConnectionConfiguration()).thenReturn(connectionConfig);
   }
 
   @After

hbase-server/src/test/java/org/apache/hadoop/hbase/client/HConnectionTestingUtility.java

@@ -129,7 +129,7 @@ public static ClusterConnection getMockedConnectionAndDecorate(final Configurati
       RpcControllerFactory.instantiate(conf));
     Mockito.when(c.getAsyncProcess()).thenReturn(asyncProcess);
     Mockito.when(c.getNewRpcRetryingCallerFactory(conf))
-      .thenReturn(RpcRetryingCallerFactory.instantiate(conf, c.getConnectionConfiguration(),
+      .thenReturn(RpcRetryingCallerFactory.instantiate(conf, connectionConfiguration,
         RetryingCallerInterceptorFactory.NO_OP_INTERCEPTOR, null, null));
     Mockito.when(c.getRpcControllerFactory()).thenReturn(Mockito.mock(RpcControllerFactory.class));
     Table t = Mockito.mock(Table.class);