(phoenix) branch 5.2 updated: PHOENIX-7605 (ADDENDUM 2) Fix hbase 2.4 build (#2159) (#2158)

[vjasani]

This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to branch 5.2
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.2 by this push:
     new 4a502707e3 PHOENIX-7605 (ADDENDUM 2) Fix hbase 2.4 build (#2159) 
(#2158)
4a502707e3 is described below

commit 4a502707e38946a2b13adea4be03a511aa4dc409
Author: ritegarg <58840065+riteg...@users.noreply.github.com>
AuthorDate: Mon May 19 10:18:28 2025 -0700

    PHOENIX-7605 (ADDENDUM 2) Fix hbase 2.4 build (#2159) (#2158)
---
 .../query/ConnectionQueryServicesImplThreadPoolIT.java      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/query/ConnectionQueryServicesImplThreadPoolIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/query/ConnectionQueryServicesImplThreadPoolIT.java
index 31c2d1df80..0ed11e00bc 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/query/ConnectionQueryServicesImplThreadPoolIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/query/ConnectionQueryServicesImplThreadPoolIT.java
@@ -21,7 +21,7 @@ package org.apache.phoenix.query;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.client.ConnectionImplementation;
+import org.apache.hadoop.hbase.client.ClusterConnection;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
@@ -147,7 +147,7 @@ public class ConnectionQueryServicesImplThreadPoolIT 
extends BaseTest {
     @Test
     public void checkHConnectionThreadPoolExecutorSame() throws Exception {
         // Extract Conn1 instance from CQSI1
-        ConnectionImplementation conn1 = 
extractConnectionFromCQSI(createCQSI("hello"));
+        ClusterConnection conn1 = 
extractConnectionFromCQSI(createCQSI("hello"));
         // Extract batchPool from connection in CQSI1
         ThreadPoolExecutor threadPoolExecutor1FromConnection = 
extractBatchPool(conn1);
         // Create another CQSI2
@@ -155,7 +155,7 @@ public class ConnectionQueryServicesImplThreadPoolIT 
extends BaseTest {
         // Extract the ThreadPoolExecutor from CQSI2 instance
         ThreadPoolExecutor threadPoolExecutor2 = 
extractThreadPoolExecutorFromCQSI(connQueryServices2);
         // Extract Conn2 from CQSI2
-        ConnectionImplementation conn2 = 
extractConnectionFromCQSI(createCQSI("bye"));
+        ClusterConnection conn2 = extractConnectionFromCQSI(createCQSI("bye"));
         // Extract batchPool from connection2 in CQSI2
         ThreadPoolExecutor threadPoolExecutor2FromConnection = 
extractBatchPool(conn2);
         // Check if ThreadPoolExecutor2 from CQSI and from Connection are Same
@@ -169,7 +169,8 @@ public class ConnectionQueryServicesImplThreadPoolIT 
extends BaseTest {
         validateThreadPoolExecutor(threadPoolExecutor2);
     }
 
-    private static ThreadPoolExecutor 
extractBatchPool(ConnectionImplementation conn) throws NoSuchFieldException, 
IllegalAccessException {
+
+    private static ThreadPoolExecutor extractBatchPool(ClusterConnection conn) 
throws NoSuchFieldException, IllegalAccessException {
         Field batchPoolField = conn.getClass().getDeclaredField("batchPool");
         batchPoolField.setAccessible(true);
         return (ThreadPoolExecutor) batchPoolField.get(conn);
@@ -274,9 +275,9 @@ public class ConnectionQueryServicesImplThreadPoolIT 
extends BaseTest {
         }
     }
 
-    private ConnectionImplementation 
extractConnectionFromCQSI(ConnectionQueryServices cqsi) throws 
NoSuchFieldException, IllegalAccessException {
+    private ClusterConnection 
extractConnectionFromCQSI(ConnectionQueryServices cqsi) throws 
NoSuchFieldException, IllegalAccessException {
         Field connectionField1 = 
cqsi.getClass().getDeclaredField("connection");
         connectionField1.setAccessible(true);
-        return (ConnectionImplementation) connectionField1.get(cqsi);
+        return (ClusterConnection) connectionField1.get(cqsi);
     }
 }