change name

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/TaosRestfulConnection.java → src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java

@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
 
-public class TaosRestfulConnection implements Connection {
+public class RestfulConnection implements Connection {
 
     private final String host;
     private final int port;
@@ -16,7 +16,7 @@ public class TaosRestfulConnection implements Connection {
     private final String url;
 
 
-    public TaosRestfulConnection(String host, String port, Properties props, String database, String url) {
+    public RestfulConnection(String host, String port, Properties props, String database, String url) {
         this.host = host;
         this.port = Integer.parseInt(port);
         this.props = props;
@@ -28,7 +28,7 @@ public class TaosRestfulConnection implements Connection {
     public Statement createStatement() throws SQLException {
         if (isClosed())
             throw new SQLException(TSDBConstants.WrapErrMsg("restful TDengine connection is closed."));
-        return new TaosRestfulStatement(this, this.database);
+        return new RestfulStatement(this, this.database);
     }
 
     @Override
@@ -78,7 +78,8 @@ public class TaosRestfulConnection implements Connection {
 
     @Override
     public DatabaseMetaData getMetaData() throws SQLException {
-        return null;
+        //TODO: RestfulDatabaseMetaData is not implemented
+        return new RestfulDatabaseMetaData();
     }
 
     @Override

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/TaosRestfulDriver.java → src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulDriver.java

@@ -11,13 +11,13 @@ import java.sql.*;
 import java.util.Properties;
 import java.util.logging.Logger;
 
-public class TaosRestfulDriver extends AbstractTaosDriver {
+public class RestfulDriver extends AbstractTaosDriver {
 
     private static final String URL_PREFIX = "jdbc:TAOS-RS://";
 
     static {
         try {
-            DriverManager.registerDriver(new TaosRestfulDriver());
+            DriverManager.registerDriver(new RestfulDriver());
         } catch (SQLException e) {
             throw new RuntimeException(TSDBConstants.WrapErrMsg("can not register Restful JDBC driver"), e);
         }
@@ -48,7 +48,7 @@ public class TaosRestfulDriver extends AbstractTaosDriver {
             throw new SQLException(jsonResult.getString("desc"));
         }
 
-        return new TaosRestfulConnection(host, port, props, database, url);
+        return new RestfulConnection(host, port, props, database, url);
     }
 
     @Override

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/TaosRestfulResultSet.java → src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java

@@ -13,13 +13,13 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Map;
 
-public class TaosRestfulResultSet implements ResultSet {
+public class RestfulResultSet implements ResultSet {
     private boolean isClosed = false;
     private int pos = -1;
     private ArrayList<ArrayList<String>> data;
     private ArrayList<String> fields;
 
-    public TaosRestfulResultSet(String str, String fieldData) {
+    public RestfulResultSet(String str, String fieldData) {
         data = new ArrayList<>();
         str = str.substring(2, str.length() - 2);
         ArrayList<String> strTemp = new ArrayList<>(Arrays.asList(str.split("],\\[")));
@@ -262,7 +262,7 @@ public class TaosRestfulResultSet implements ResultSet {
 
     @Override
     public ResultSetMetaData getMetaData() throws SQLException {
-        return new TaosRestfulResultSetMetaData(fields);
+        return new RestfulResultSetMetaData(fields);
     }
 
     @Override

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/TaosRestfulResultSetMetaData.java → src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java

@@ -4,11 +4,11 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.List;
 
-public class TaosRestfulResultSetMetaData implements ResultSetMetaData {
+public class RestfulResultSetMetaData implements ResultSetMetaData {
 
     private List<String> fields;
 
-    public TaosRestfulResultSetMetaData(List<String> fields) {
+    public RestfulResultSetMetaData(List<String> fields) {
         this.fields = fields;
     }
 

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/TaosRestfulStatement.java → src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java

@@ -9,12 +9,12 @@ import java.sql.*;
 import java.util.Arrays;
 import java.util.List;
 
-public class TaosRestfulStatement implements Statement {
+public class RestfulStatement implements Statement {
 
     private final String catalog;
-    private final TaosRestfulConnection conn;
+    private final RestfulConnection conn;
 
-    public TaosRestfulStatement(TaosRestfulConnection c, String catalog) {
+    public RestfulStatement(RestfulConnection c, String catalog) {
         this.conn = c;
         this.catalog = catalog;
     }
@@ -46,12 +46,12 @@ public class TaosRestfulStatement implements Statement {
         }
         String dataStr = jsonObject.getString("data");
         if ("use".equalsIgnoreCase(fields.split(" ")[0])) {
-            return new TaosRestfulResultSet(dataStr, "");
+            return new RestfulResultSet(dataStr, "");
         }
 
         JSONObject jsonField = JSON.parseObject(fields);
         if (jsonField == null) {
-            return new TaosRestfulResultSet(dataStr, "");
+            return new RestfulResultSet(dataStr, "");
         }
         if (jsonField.getString("status").equals("error")) {
             throw new SQLException(TSDBConstants.WrapErrMsg("SQL execution error: " +
@@ -60,7 +60,7 @@ public class TaosRestfulStatement implements Statement {
         }
         String fieldData = jsonField.getString("data");
 
-        return new TaosRestfulResultSet(dataStr, fieldData);
+        return new RestfulResultSet(dataStr, fieldData);
     }
 
     @Override

src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/TaosRestfulDriverTest.java → src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulDriverTest.java

@@ -5,12 +5,12 @@ import org.junit.Test;
 
 import java.sql.*;
 
-public class TaosRestfulDriverTest {
+public class RestfulDriverTest {
 
     @Test
     public void testCase001() {
         try {
-            Class.forName("com.taosdata.jdbc.rs.TaosRestfulDriver");
+            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
             Connection connection = DriverManager.getConnection("jdbc:TAOS-RS://master:6041/?user=root&password=taosdata");
             Statement statement = connection.createStatement();
             ResultSet resultSet = statement.executeQuery("select * from log.log");
@@ -32,7 +32,7 @@ public class TaosRestfulDriverTest {
 
     @Test
     public void testAcceptUrl() throws SQLException {
-        Driver driver = new TaosRestfulDriver();
+        Driver driver = new RestfulDriver();
         boolean isAccept = driver.acceptsURL("jdbc:TAOS-RS://master:6041");
         Assert.assertTrue(isAccept);
     }