Reflection utilities.

h2/src/main/org/h2/tools/Console.java

@@ -261,9 +261,7 @@ ShutdownHandler {
     private boolean createTrayIcon() {
         try {
             // SystemTray.isSupported();
-            Boolean supported = (Boolean) Class.forName("java.awt.SystemTray").
-                getMethod("isSupported").
-                invoke(null);
+            boolean supported = (Boolean) Utils.callStaticMethod("java.awt.SystemTray.isSupported");
             if (!supported) {
                 return false;
             }
@@ -285,14 +283,11 @@ ShutdownHandler {
             menuConsole.add(itemExit);
 
             // SystemTray tray = SystemTray.getSystemTray();
-            Object tray = Class.forName("java.awt.SystemTray").
-                getMethod("getSystemTray").
-                invoke(null);
+            Object tray = Utils.callStaticMethod("java.awt.SystemTray.getSystemTray");
 
             // Dimension d = tray.getTrayIconSize();
-            Dimension d = (Dimension) Class.forName("java.awt.SystemTray").
-                getMethod("getTrayIconSize").
-                invoke(tray);
+            Dimension d = (Dimension) Utils.callMethod(tray, "getTrayIconSize");
+
             String iconFile;
             if (d.width >= 24 && d.height >= 24) {
                 iconFile = "/org/h2/res/h2-24.png";
@@ -302,20 +297,15 @@ ShutdownHandler {
                 iconFile = "/org/h2/res/h2.png";
             }
             Image icon = loadImage(iconFile);
-            // TrayIcon icon = new TrayIcon(image, "H2 Database Engine", menuConsole);
-            Object ti = Class.forName("java.awt.TrayIcon").
-                getConstructor(Image.class, String.class, PopupMenu.class).
-                newInstance(icon, "H2 Database Engine", menuConsole);
-
-            // trayIcon.addMouseListener(this);
-            ti.getClass().
-                getMethod("addMouseListener", MouseListener.class).
-                invoke(ti, this);
-
-            // tray.add(icon);
-            tray.getClass().
-                getMethod("add", Class.forName("java.awt.TrayIcon")).
-                invoke(tray, ti);
+
+            // TrayIcon ti = new TrayIcon(image, "H2 Database Engine", menuConsole);
+            Object ti = Utils.newInstance("java.awt.TrayIcon", icon, "H2 Database Engine", menuConsole);
+
+            // ti.addMouseListener(this);
+            Utils.callMethod(ti, "addMouseListener", this);
+
+            // tray.add(ti);
+            Utils.callMethod(tray, "add", ti);
 
             this.trayIcon = true;
 

h2/src/main/org/h2/tools/Shell.java

@@ -12,7 +12,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.io.StringReader;
-import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
@@ -24,13 +23,13 @@ import java.util.ArrayList;
 import java.util.Properties;
 import org.h2.engine.Constants;
 import org.h2.server.web.ConnectionInfo;
-import org.h2.util.ScriptReader;
-import org.h2.util.Utils;
 import org.h2.util.IOUtils;
 import org.h2.util.JdbcUtils;
 import org.h2.util.New;
+import org.h2.util.ScriptReader;
 import org.h2.util.SortedProperties;
 import org.h2.util.Tool;
+import org.h2.util.Utils;
 
 /**
  * Interactive command line tool to access a database using JDBC.
@@ -414,11 +413,9 @@ public class Shell extends Tool implements Runnable {
 
     private String readPassword() throws IOException {
         try {
-            Method getConsole = System.class.getMethod("console");
-            Object console = getConsole.invoke(null);
-            Method readPassword = console.getClass().getMethod("readPassword");
+            Object console = Utils.callStaticMethod("java.lang.System.console");
             print("Password  ");
-            char[] password = (char[]) readPassword.invoke(console);
+            char[] password = (char[]) Utils.callMethod(console, "readPassword");
             return password == null ? null : new String(password);
         } catch (Exception e) {
             // ignore, use the default solution

h2/src/main/org/h2/upgrade/DbUpgradeNonPageStoreToCurrent.java

@@ -64,9 +64,9 @@ public class DbUpgradeNonPageStoreToCurrent {
             oldUrl = oldUrl.replaceAll(";IFEXISTS=FALSE", "");
             oldUrl += ";IGNORE_UNKNOWN_SETTINGS=TRUE";
             Object ci = Utils.newInstance("org.h2.upgrade.v1_1.engine.ConnectionInfo", oldUrl, info);
-            boolean isRemote = (Boolean) Utils.callMethod("isRemote", ci);
-            boolean isPersistent = (Boolean) Utils.callMethod("isPersistent", ci);
-            String dbName = (String) Utils.callMethod("getName", ci);
+            boolean isRemote = (Boolean) Utils.callMethod(ci, "isRemote");
+            boolean isPersistent = (Boolean) Utils.callMethod(ci, "isPersistent");
+            String dbName = (String) Utils.callMethod(ci, "getName");
             // remove stackable file systems
             int colon = dbName.indexOf(':');
             while (colon != -1) {

h2/src/main/org/h2/value/DataType.java

@@ -768,6 +768,9 @@ public class DataType {
         if (x == null) {
             return Value.NULL;
         }
+        if (x.isPrimitive()) {
+            x = Utils.getNonPrimitiveClass(x);
+        }
         if (ResultSet.class.isAssignableFrom(x)) {
             return Value.RESULT_SET;
         } else if (Value.ValueBlob.class.isAssignableFrom(x)) {
@@ -778,21 +781,21 @@ public class DataType {
             return Value.STRING;
         } else if (BigDecimal.class.isAssignableFrom(x)) {
             return Value.DECIMAL;
-        } else if (Boolean.class.isAssignableFrom(x) || boolean.class.isAssignableFrom(x)) {
+        } else if (Boolean.class == x) {
             return Value.BOOLEAN;
-        } else if (Byte.class.isAssignableFrom(x) || byte.class.isAssignableFrom(x)) {
+        } else if (Byte.class == x) {
             return Value.BYTE;
-        } else if (Short.class.isAssignableFrom(x) || short.class.isAssignableFrom(x)) {
+        } else if (Short.class == x) {
             return Value.SHORT;
-        } else if (Integer.class.isAssignableFrom(x) || int.class.isAssignableFrom(x)) {
+        } else if (Integer.class == x) {
             return Value.INT;
-        } else if (Character.class.isAssignableFrom(x) || char.class.isAssignableFrom(x)) {
+        } else if (Character.class == x) {
             throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, "char (not supported)");
-        } else if (Long.class.isAssignableFrom(x) || long.class.isAssignableFrom(x)) {
+        } else if (Long.class == x) {
             return Value.LONG;
-        } else if (Float.class.isAssignableFrom(x) || float.class.isAssignableFrom(x)) {
+        } else if (Float.class == x) {
             return Value.FLOAT;
-        } else if (Double.class.isAssignableFrom(x) || double.class.isAssignableFrom(x)) {
+        } else if (Double.class == x) {
             return Value.DOUBLE;
         } else if (byte[].class.isAssignableFrom(x)) {
             return Value.BYTES;

h2/src/test/org/h2/test/unit/TestUtils.java

@@ -35,12 +35,12 @@ public class TestUtils extends TestBase {
         long currentTimeMillis2 = (Long) Utils.callStaticMethod("java.lang.System.currentTimeMillis");
         assertTrue(currentTimeMillis1 <= currentTimeMillis2);
         // New Instance with Integer parameter (Autoboxing)
-        StringBuilder instance = (StringBuilder) Utils.newInstance("java.lang.StringBuilder", new Integer(10));
+        Object instance = Utils.newInstance("java.lang.StringBuilder", 10);
         // New Instance with int parameter
-        instance = (StringBuilder) Utils.newInstance("java.lang.StringBuilder", 10);
+        instance = Utils.newInstance("java.lang.StringBuilder", 10);
         // Instance methods
-        Utils.callMethod("append", instance, "abc");
-        int length = (Integer) Utils.callMethod("length", instance);
+        Utils.callMethod(instance, "append", "abc");
+        int length = (Integer) Utils.callMethod(instance, "length");
         assertEquals(3, length);
         // Static fields
         String pathSeparator = (String) Utils.getStaticField("java.io.File.pathSeparator");
@@ -51,7 +51,9 @@ public class TestUtils extends TestBase {
         // Class present?
         assertFalse(Utils.isClassPresent("abc"));
         assertTrue(Utils.isClassPresent(getClass().getName()));
-
+        Utils.callStaticMethod("java.lang.String.valueOf", "a");
+        Utils.callStaticMethod("java.awt.AWTKeyStroke.getAWTKeyStroke",
+                'x', java.awt.event.InputEvent.SHIFT_DOWN_MASK);
     }
 
 }