- Updated the JSON write() methods in the HTTP Request class to encode the JSON to UTF-8

 - Added new getTableNames() method to the Database class
 - Removed debug/print statement in the Connection class

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1560 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff

Author: pborissow

src/javaxt/http/Request.java

@@ -427,19 +427,31 @@ public void write(byte[] payload) {
   //** write
   //**************************************************************************
   /** Used to open an HTTP connection and sent a JSON object to the server.
+   *  Note that the JSON object is encoded using UTF-8. In some applications,
+   *  the encoding may need to be explicitly defined in the "Content-Type"
+   *  request header. Example:
+   <pre>
+    request.setHeader("Content-Type", "application/json;charset=UTF-8");
+   </pre>
    */
     public void write(javaxt.json.JSONObject json){
-        write(json.toString().getBytes());
+        write(json.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8));
     }
 
 
   //**************************************************************************
   //** write
   //**************************************************************************
   /** Used to open an HTTP connection and sent a JSON array to the server.
+   *  Note that the JSON array is encoded using UTF-8. In some applications,
+   *  the encoding may need to be explicitly defined in the "Content-Type"
+   *  request header. Example:
+   <pre>
+    request.setHeader("Content-Type", "application/json;charset=UTF-8");
+   </pre>
    */
     public void write(javaxt.json.JSONArray arr){
-        write(arr.toString().getBytes());
+        write(arr.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8));
     }
 
 

src/javaxt/sql/Connection.java

@@ -205,7 +205,7 @@ public boolean open(java.sql.Connection conn){
    </pre>
    */
     public void close(){
-        System.out.println("Closing connection...");
+        //System.out.println("Closing connection...");
         try{Conn.close();}
         catch(Exception e){
             //e.printStackTrace();

src/javaxt/sql/Database.java

@@ -763,9 +763,10 @@ public void run() throws InterruptedException {
   //**************************************************************************
   //** getTables
   //**************************************************************************
-  /** Used to retrieve an array of tables found in this database.
+  /** Used to retrieve an array of tables and columns found in this database.
    */
     public Table[] getTables() throws SQLException {
+        if (tables!=null) return tables;
         try (Connection conn = getConnection()){
             return getTables(conn);
         }
@@ -775,7 +776,7 @@ public Table[] getTables() throws SQLException {
   //**************************************************************************
   //** getTables
   //**************************************************************************
-  /** Used to retrieve an array of tables found in a database.
+  /** Used to retrieve an array of tables and columns found in a database.
    */
     public static Table[] getTables(Connection conn){
         Database database = conn.getDatabase();
@@ -802,6 +803,56 @@ public static Table[] getTables(Connection conn){
     }
 
 
+  //**************************************************************************
+  //** getTableNames
+  //**************************************************************************
+  /** Used to retrieve an array of table names found in the database. If a
+   *  table is part of a schema, the schema name is prepended to the table
+   *  name. This method is significantly faster than the getTables() method
+   *  which returns the full metadata for each table.
+   */
+    public String[] getTableNames() throws SQLException {
+        java.util.ArrayList<javaxt.utils.Record> tableNames = new java.util.ArrayList<>();
+
+
+        if (tables!=null){
+            for (Table table : tables){
+                javaxt.utils.Record record = new javaxt.utils.Record();
+                record.set("schema", table.getSchema());
+                record.set("table", table.getName());
+                tableNames.add(record);
+            }
+        }
+        else{
+            try (Connection conn = getConnection()){
+
+                DatabaseMetaData dbmd = conn.getConnection().getMetaData();
+                try (ResultSet rs = dbmd.getTables(null,null,null,new String[]{"TABLE"})){
+                    while (rs.next()) {
+                        javaxt.utils.Record record = new javaxt.utils.Record();
+                        record.set("schema", rs.getString("TABLE_SCHEM"));
+                        record.set("table", rs.getString("TABLE_NAME"));
+                        tableNames.add(record);
+                    }
+                }
+            }
+        }
+
+        String[] arr = new String[tableNames.size()];
+        for (int i=0; i<arr.length; i++){
+            javaxt.utils.Record record = tableNames.get(i);
+            String tableName = record.get("table").toString();
+            String schemaName = record.get("schema").toString();
+            if (schemaName!=null && !schemaName.isEmpty()){
+                tableName = schemaName + "." + tableName;
+            }
+            arr[i] = tableName;
+        }
+        java.util.Arrays.sort(arr);
+        return arr;
+    }
+
+
   //**************************************************************************
   //** getCatalogs
   //**************************************************************************