From ddd8823614af11e89ba8dd6725ec42e53891a7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= <szujobs@hotmail.com>
Date: Fri, 18 May 2012 21:39:01 +0800
Subject: [PATCH] refactor

---
 .../druid/common/jdbc/ConnectionBase.java     | 17 +++++++++++++++++
 .../alibaba/druid/hbase/HBaseConnection.java  |  7 +------
 .../alibaba/druid/mock/MockConnection.java    | 19 ++-----------------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/common/jdbc/ConnectionBase.java b/src/main/java/com/alibaba/druid/common/jdbc/ConnectionBase.java
index 14848263c0..4030e36df5 100644
--- a/src/main/java/com/alibaba/druid/common/jdbc/ConnectionBase.java
+++ b/src/main/java/com/alibaba/druid/common/jdbc/ConnectionBase.java
@@ -5,6 +5,7 @@ import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 public abstract class ConnectionBase implements Connection {
 
@@ -16,6 +17,22 @@ public abstract class ConnectionBase implements Connection {
     private SQLWarning            warings;
     private boolean               readOnly;
 
+    private String                url;
+    private Properties            info;
+
+    public ConnectionBase(String url, Properties info){
+        this.url = url;
+        this.info = info;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public Properties getConnectProperties() {
+        return info;
+    }
+
     @Override
     public void setAutoCommit(boolean autoCommit) throws SQLException {
         this.autoCommit = autoCommit;
diff --git a/src/main/java/com/alibaba/druid/hbase/HBaseConnection.java b/src/main/java/com/alibaba/druid/hbase/HBaseConnection.java
index d9925ced75..f43d32d789 100644
--- a/src/main/java/com/alibaba/druid/hbase/HBaseConnection.java
+++ b/src/main/java/com/alibaba/druid/hbase/HBaseConnection.java
@@ -25,10 +25,9 @@ import com.alibaba.druid.common.jdbc.ConnectionBase;
 public class HBaseConnection extends ConnectionBase implements Connection {
 
     private Configuration config;
-    private final String  url;
 
     public HBaseConnection(String url, Properties info){
-        this.url = url;
+        super(url, info);
         config = new Configuration();
         this.setClientInfo(info);
     }
@@ -104,10 +103,6 @@ public class HBaseConnection extends ConnectionBase implements Connection {
         return null;
     }
 
-    public String getUrl() {
-        return url;
-    }
-
     @Override
     public boolean isClosed() throws SQLException {
         return false;
diff --git a/src/main/java/com/alibaba/druid/mock/MockConnection.java b/src/main/java/com/alibaba/druid/mock/MockConnection.java
index 959ded894c..938a2e939d 100644
--- a/src/main/java/com/alibaba/druid/mock/MockConnection.java
+++ b/src/main/java/com/alibaba/druid/mock/MockConnection.java
@@ -44,36 +44,25 @@ public class MockConnection extends ConnectionBase implements Connection {
 
     private MockDriver driver;
 
-    private Properties connectProperties;
-
     private long       id;
 
     private final long createdTimeMillis    = System.currentTimeMillis();
     private long       lastActiveTimeMillis = System.currentTimeMillis();
-    private String     url;
 
     public MockConnection(){
         this(null, null, null);
     }
 
     public MockConnection(MockDriver driver, String url, Properties connectProperties){
+        super(url, connectProperties);
+
         this.driver = driver;
-        this.connectProperties = connectProperties;
-        this.url = url;
 
         if (driver != null) {
             this.id = driver.generateConnectionId();
         }
     }
 
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
     public long getLastActiveTimeMillis() {
         return lastActiveTimeMillis;
     }
@@ -94,10 +83,6 @@ public class MockConnection extends ConnectionBase implements Connection {
         return driver;
     }
 
-    public Properties getConnectProperties() {
-        return connectProperties;
-    }
-
     public void setDriver(MockDriver driver) {
         this.driver = driver;
     }