Merge pull request #183 from oceanbase/revert_table_client_manager

revert table client manager

Author: maochongxin

src/main/java/com/alipay/oceanbase/hbase/util/ObTableClientManager.java

@@ -22,7 +22,6 @@
 import com.google.common.base.Objects;
 import org.apache.hadoop.classification.InterfaceAudience;
 
-
 import java.io.IOException;
 import java.util.Map;
 import java.util.Properties;
@@ -37,7 +36,7 @@
 public class ObTableClientManager {
 
     public static final ConcurrentHashMap<ObTableClientKey, ReentrantLock> OB_TABLE_CLIENT_LOCK     = new ConcurrentHashMap<ObTableClientKey, ReentrantLock>();
-    public static final Map<ObTableClientKey, ObTableClient> OB_TABLE_CLIENT_INSTANCE = new ConcurrentHashMap<>();
+    public static final Map<ObTableClientKey, ObTableClient>               OB_TABLE_CLIENT_INSTANCE = new ConcurrentHashMap<ObTableClientKey, ObTableClient>();
 
     public static ObTableClient getOrCreateObTableClient(OHConnectionConfiguration connectionConfig)
                                                                                                     throws IllegalArgumentException,
@@ -58,23 +57,18 @@ public static ObTableClient getOrCreateObTableClient(OHConnectionConfiguration c
         } else {
             checkArgument(isNotBlank(connectionConfig.getParamUrl()), HBASE_OCEANBASE_PARAM_URL
                     + " is blank");
-            obTableClientKey = generateObTableClientKey(connectionConfig);
-        }
-        return getOrCreateObTableClient(obTableClientKey, connectionConfig.getRpcConnectTimeout());
-    }
-    
-    public static ObTableClientKey generateObTableClientKey(OHConnectionConfiguration connectionConfig) {
-        ObTableClientKey obTableClientKey = new ObTableClientKey();
-        String paramUrl = connectionConfig.getParamUrl();
-        if (!paramUrl.contains("database")) {
-            paramUrl += "&database=default";
-        }
-        obTableClientKey.setParamUrl(paramUrl);
-        obTableClientKey.setSysUserName(connectionConfig.getSysUsername());
-        if (connectionConfig.getSysPassword() == null) {
-            obTableClientKey.setSysPassword(Constants.EMPTY_STRING);
-        } else {
-            obTableClientKey.setSysPassword(connectionConfig.getSysPassword());
+            obTableClientKey = new ObTableClientKey();
+            String paramUrl = connectionConfig.getParamUrl();
+            if (!paramUrl.contains("database")) {
+                paramUrl += "&database=default";
+            }
+            obTableClientKey.setParamUrl(paramUrl);
+            obTableClientKey.setSysUserName(connectionConfig.getSysUsername());
+            if (connectionConfig.getSysPassword() == null) {
+                obTableClientKey.setSysPassword(Constants.EMPTY_STRING);
+            } else {
+                obTableClientKey.setSysPassword(connectionConfig.getSysPassword());
+            }
         }
         checkArgument(isNotBlank(connectionConfig.getFullUsername()),
                 HBASE_OCEANBASE_FULL_USER_NAME + " is blank");
@@ -90,7 +84,7 @@ public static ObTableClientKey generateObTableClientKey(OHConnectionConfiguratio
             obTableClientKey.getProperties().put(property.getKey(), property.getValue());
         }
 
-        return obTableClientKey;
+        return getOrCreateObTableClient(obTableClientKey, connectionConfig.getRpcConnectTimeout());
     }
 
     public static ObTableClient getOrCreateObTableClient(ObTableClientKey obTableClientKey,