Skip to content

H
h2database
提交 1797573d authored 作者: Thomas Mueller's avatar Thomas Mueller
浏览文件
操作

Removed the now unnecessary spaces around the generic wildcard < ? >

上级 9bed4a26
隐藏空白字符变更
内嵌 并排
正在显示 包含 119 行增加 和 119 行删除
h2/src/main/org/h2/engine/FunctionAlias.java
浏览文件 @ 1797573d
......@@ -132,7 +132,7 @@ public class FunctionAlias extends SchemaObjectBase {
}
private void loadClass() {
Class< ? > javaClass = Utils.loadUserClass(className);
Class<?> javaClass = Utils.loadUserClass(className);
Method[] methods = javaClass.getMethods();
ArrayList<JavaMethod> list = New.arrayList();
for (int i = 0, len = methods.length; i < len; i++) {
......@@ -168,7 +168,7 @@ public class FunctionAlias extends SchemaObjectBase {
private String getMethodSignature(Method m) {
StatementBuilder buff = new StatementBuilder(m.getName());
buff.append('(');
for (Class< ? > p : m.getParameterTypes()) {
for (Class<?> p : m.getParameterTypes()) {
// do not use a space here, because spaces are removed
// in CreateFunctionAlias.setJavaClassMethod()
buff.appendExceptFirst(",");
......@@ -275,29 +275,29 @@ public class FunctionAlias extends SchemaObjectBase {
private final int dataType;
private boolean hasConnectionParam;
private boolean varArgs;
private Class< ? > varArgClass;
private Class<?> varArgClass;
private int paramCount;
JavaMethod(Method method, int id) {
this.method = method;
this.id = id;
Class< ? >[] paramClasses = method.getParameterTypes();
Class<?>[] paramClasses = method.getParameterTypes();
paramCount = paramClasses.length;
if (paramCount > 0) {
Class< ? > paramClass = paramClasses[0];
Class<?> paramClass = paramClasses[0];
if (Connection.class.isAssignableFrom(paramClass)) {
hasConnectionParam = true;
paramCount--;
}
}
if (paramCount > 0) {
Class< ? > lastArg = paramClasses[paramClasses.length - 1];
Class<?> lastArg = paramClasses[paramClasses.length - 1];
if (lastArg.isArray() && FunctionAlias.isVarArgs(method)) {
varArgs = true;
varArgClass = lastArg.getComponentType();
}
}
Class< ? > returnClass = method.getReturnType();
Class<?> returnClass = method.getReturnType();
dataType = DataType.getTypeFromClass(returnClass);
}
......@@ -323,7 +323,7 @@ public class FunctionAlias extends SchemaObjectBase {
* @return the value
*/
public Value getValue(Session session, Expression[] args, boolean columnList) {
Class< ? >[] paramClasses = method.getParameterTypes();
Class<?>[] paramClasses = method.getParameterTypes();
Object[] params = new Object[paramClasses.length];
int p = 0;
if (hasConnectionParam && params.length > 0) {
......@@ -340,7 +340,7 @@ public class FunctionAlias extends SchemaObjectBase {
for (int a = 0, len = args.length; a < len; a++, p++) {
boolean currentIsVarArg = varArgs && p >= paramClasses.length - 1;
Class< ? > paramClass;
Class<?> paramClass;
if (currentIsVarArg) {
paramClass = varArgClass;
} else {
......@@ -404,7 +404,7 @@ public class FunctionAlias extends SchemaObjectBase {
}
}
public Class< ? >[] getColumnClasses() {
public Class<?>[] getColumnClasses() {
return method.getParameterTypes();
}
......
h2/src/main/org/h2/engine/UserAggregate.java
浏览文件 @ 1797573d
......@@ -19,7 +19,7 @@ import org.h2.util.Utils;
public class UserAggregate extends DbObjectBase {
private String className;
private Class< ? > javaClass;
private Class<?> javaClass;
public UserAggregate(Database db, int id, String name, String className, boolean force) {
initDbObjectBase(db, id, name, Trace.FUNCTION);
......
h2/src/main/org/h2/jdbc/JdbcArray.java
浏览文件 @ 1797573d
......@@ -57,7 +57,7 @@ public class JdbcArray extends TraceObject implements Array {
* @param map is ignored. Only empty or null maps are supported
* @return the Object array
*/
public Object getArray(Map<String, Class< ? >> map) throws SQLException {
public Object getArray(Map<String, Class<?>> map) throws SQLException {
try {
debugCode("getArray("+quoteMap(map)+");");
checkMap(map);
......@@ -97,7 +97,7 @@ public class JdbcArray extends TraceObject implements Array {
* @param map is ignored. Only empty or null maps are supported
* @return the Object array
*/
public Object getArray(long index, int count, Map<String, Class< ? >> map) throws SQLException {
public Object getArray(long index, int count, Map<String, Class<?>> map) throws SQLException {
try {
debugCode("getArray(" + index + ", " + count + ", " + quoteMap(map)+");");
checkClosed();
......@@ -164,7 +164,7 @@ public class JdbcArray extends TraceObject implements Array {
* @param map is ignored. Only empty or null maps are supported
* @return the result set
*/
public ResultSet getResultSet(Map<String, Class< ? >> map) throws SQLException {
public ResultSet getResultSet(Map<String, Class<?>> map) throws SQLException {
try {
debugCode("getResultSet("+quoteMap(map)+");");
checkClosed();
......@@ -207,7 +207,7 @@ public class JdbcArray extends TraceObject implements Array {
* @param map is ignored. Only empty or null maps are supported
* @return the result set
*/
public ResultSet getResultSet(long index, int count, Map<String, Class< ? >> map) throws SQLException {
public ResultSet getResultSet(long index, int count, Map<String, Class<?>> map) throws SQLException {
try {
debugCode("getResultSet("+index+", " + count+", " + quoteMap(map)+");");
checkClosed();
......@@ -263,7 +263,7 @@ public class JdbcArray extends TraceObject implements Array {
return subset;
}
private void checkMap(Map<String, Class< ? >> map) {
private void checkMap(Map<String, Class<?>> map) {
if (map != null && map.size() > 0) {
throw DbException.getUnsupportedException("map.size > 0");
}
......
h2/src/main/org/h2/jdbc/JdbcConnection.java
浏览文件 @ 1797573d
......@@ -754,7 +754,7 @@ public class JdbcConnection extends TraceObject implements Connection {
* @throws SQLException
* if the connection is closed
*/
public Map<String, Class< ? >> getTypeMap() throws SQLException {
public Map<String, Class<?>> getTypeMap() throws SQLException {
try {
debugCodeCall("getTypeMap");
checkClosed();
......@@ -768,7 +768,7 @@ public class JdbcConnection extends TraceObject implements Connection {
* [Partially supported] Sets the type map. This is only supported if the
* map is empty or null.
*/
public void setTypeMap(Map<String, Class< ? >> map) throws SQLException {
public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
try {
debugCode("setTypeMap(" + quoteMap(map) + ");");
checkMap(map);
......@@ -1033,7 +1033,7 @@ public class JdbcConnection extends TraceObject implements Connection {
try {
//## Java 1.4 begin ##
// check for existence of this class (avoiding Class . forName)
Class< ? > clazz = java.sql.Savepoint.class;
Class<?> clazz = java.sql.Savepoint.class;
clazz.getClass();
//## Java 1.4 end ##
} catch (NoClassDefFoundError e) {
......@@ -1586,7 +1586,7 @@ public class JdbcConnection extends TraceObject implements Connection {
* @param iface the class
*/
//## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException {
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
......@@ -1629,7 +1629,7 @@ public class JdbcConnection extends TraceObject implements Connection {
return v;
}
private void checkMap(Map<String, Class< ? >> map) {
private void checkMap(Map<String, Class<?>> map) {
if (map != null && map.size() > 0) {
throw DbException.getUnsupportedException("map.size > 0");
}
......
h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
浏览文件 @ 1797573d
......@@ -2817,7 +2817,7 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
* [Not supported] Checks if unwrap can return an object of this class.
*/
//## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException {
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
......
h2/src/main/org/h2/jdbc/JdbcParameterMetaData.java
浏览文件 @ 1797573d
......@@ -227,7 +227,7 @@ implements ParameterMetaData
* [Not supported] Checks if unwrap can return an object of this class.
*/
//## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException {
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
......
h2/src/main/org/h2/jdbc/JdbcResultSet.java
浏览文件 @ 1797573d
......@@ -771,7 +771,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* [Not supported] Gets a column as a object using the specified type
* mapping.
*/
public Object getObject(String columnLabel, Map<String, Class< ? >> map) throws SQLException {
public Object getObject(String columnLabel, Map<String, Class<?>> map) throws SQLException {
throw unsupported("map");
}
......@@ -3415,7 +3415,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
* [Not supported] Checks if unwrap can return an object of this class.
*/
//## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException {
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
......
h2/src/main/org/h2/jdbc/JdbcResultSetMetaData.java
浏览文件 @ 1797573d
......@@ -442,7 +442,7 @@ public class JdbcResultSetMetaData extends TraceObject implements ResultSetMetaD
* [Not supported] Checks if unwrap can return an object of this class.
*/
//## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException {
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
......
h2/src/main/org/h2/jdbc/JdbcStatement.java
浏览文件 @ 1797573d
......@@ -973,7 +973,7 @@ public class JdbcStatement extends TraceObject implements Statement {
* [Not supported] Checks if unwrap can return an object of this class.
*/
//## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException {
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
......
h2/src/main/org/h2/jdbcx/JdbcConnectionPool.java
浏览文件 @ 1797573d
......@@ -354,7 +354,7 @@ public class JdbcConnectionPool implements DataSource, ConnectionEventListener {
* @param iface the class
*/
//## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException {
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw DbException.getUnsupportedException("isWrapperFor");
}
//## Java 1.6 end ##
......
h2/src/main/org/h2/jdbcx/JdbcDataSource.java
浏览文件 @ 1797573d
......@@ -376,7 +376,7 @@ implements XADataSource, DataSource, ConnectionPoolDataSource, Serializable, Ref
* @param iface the class
*/
//## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException {
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw unsupported("isWrapperFor");
}
//## Java 1.6 end ##
......
h2/src/main/org/h2/message/TraceObject.java
浏览文件 @ 1797573d
......@@ -355,7 +355,7 @@ public class TraceObject {
* @param map the map to convert
* @return the Java source code
*/
protected String quoteMap(Map<String, Class< ? >> map) {
protected String quoteMap(Map<String, Class<?>> map) {
if (map == null) {
return "null";
}
......@@ -364,9 +364,9 @@ public class TraceObject {
}
StringBuilder buff = new StringBuilder("new Map() /* ");
try {
for (Map.Entry<String, Class < ? >> entry : map.entrySet()) {
for (Map.Entry<String, Class <?>> entry : map.entrySet()) {
String key = entry.getKey();
Class< ? > clazz = entry.getValue();
Class<?> clazz = entry.getValue();
buff.append(key).append(':').append(clazz.getName());
}
} catch (Exception e) {
......
h2/src/main/org/h2/server/web/WebServlet.java
浏览文件 @ 1797573d
......@@ -31,7 +31,7 @@ public class WebServlet extends HttpServlet {
public void init() {
ServletConfig config = getServletConfig();
Enumeration< ? > en = config.getInitParameterNames();
Enumeration<?> en = config.getInitParameterNames();
ArrayList<String> list = New.arrayList();
while (en.hasMoreElements()) {
String name = en.nextElement().toString();
......@@ -93,7 +93,7 @@ public class WebServlet extends HttpServlet {
file = getAllowedFile(req, file);
byte[] bytes = null;
Properties attributes = new Properties();
Enumeration< ? > en = req.getAttributeNames();
Enumeration<?> en = req.getAttributeNames();
while (en.hasMoreElements()) {
String name = en.nextElement().toString();
String value = req.getAttribute(name).toString();
......
h2/src/main/org/h2/store/FileStore.java
浏览文件 @ 1797573d
......@@ -55,7 +55,7 @@ public class FileStore {
private FileObject file;
private long filePos;
private long fileLength;
private Reference< ? > autoDeleteReference;
private Reference<?> autoDeleteReference;
private boolean checkedWriting = true;
private boolean synchronousMode;
private String mode;
......
h2/src/main/org/h2/table/MetaTable.java
浏览文件 @ 1797573d
......@@ -1117,9 +1117,9 @@ public class MetaTable extends Table {
for (SchemaObject aliasAsSchemaObject : database.getAllSchemaObjects(DbObject.FUNCTION_ALIAS)) {
FunctionAlias alias = (FunctionAlias) aliasAsSchemaObject;
for (FunctionAlias.JavaMethod method : alias.getJavaMethods()) {
Class< ? >[] columnList = method.getColumnClasses();
Class<?>[] columnList = method.getColumnClasses();
for (int k = 0; k < columnList.length; k++) {
Class< ? > clazz = columnList[k];
Class<?> clazz = columnList[k];
int dataType = DataType.getTypeFromClass(clazz);
DataType dt = DataType.getDataType(dataType);
int nullable = clazz.isPrimitive() ? DatabaseMetaData.columnNoNulls
......
h2/src/main/org/h2/tools/Server.java
浏览文件 @ 1797573d
......@@ -484,7 +484,7 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
return;
}
try {
Class< ? > desktopClass = Class.forName("java.awt.Desktop");
Class<?> desktopClass = Class.forName("java.awt.Desktop");
// Desktop.isDesktopSupported()
Boolean supported = (Boolean) desktopClass.
getMethod("isDesktopSupported").
......
h2/src/main/org/h2/tools/SimpleResultSet.java
浏览文件 @ 1797573d
......@@ -113,7 +113,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
/**
* INTERNAL
*/
public Object getArray(Map<String, Class< ? >> map) throws SQLException {
public Object getArray(Map<String, Class<?>> map) throws SQLException {
throw getUnsupportedException();
}
......@@ -127,7 +127,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
/**
* INTERNAL
*/
public Object getArray(long index, int count, Map<String, Class< ? >> map) throws SQLException {
public Object getArray(long index, int count, Map<String, Class<?>> map) throws SQLException {
throw getUnsupportedException();
}
......@@ -159,7 +159,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
/**
* INTERNAL
*/
public ResultSet getResultSet(Map<String, Class< ? >> map) throws SQLException {
public ResultSet getResultSet(Map<String, Class<?>> map) throws SQLException {
throw getUnsupportedException();
}
......@@ -173,7 +173,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
/**
* INTERNAL
*/
public ResultSet getResultSet(long index, int count, Map<String, Class< ? >> map) throws SQLException {
public ResultSet getResultSet(long index, int count, Map<String, Class<?>> map) throws SQLException {
throw getUnsupportedException();
}
......@@ -1457,7 +1457,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
/**
* INTERNAL
*/
public Object getObject(int i, Map<String, Class< ? >> map) throws SQLException {
public Object getObject(int i, Map<String, Class<?>> map) throws SQLException {
throw getUnsupportedException();
}
......@@ -1583,7 +1583,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
/**
* INTERNAL
*/
public Object getObject(String colName, Map<String, Class< ? >> map) throws SQLException {
public Object getObject(String colName, Map<String, Class<?>> map) throws SQLException {
throw getUnsupportedException();
}
......@@ -1841,7 +1841,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
* INTERNAL
*/
//## Java 1.6 begin ##
public boolean isWrapperFor(Class< ? > iface) throws SQLException {
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw getUnsupportedException();
}
//## Java 1.6 end ##
......
h2/src/main/org/h2/util/JdbcUtils.java
浏览文件 @ 1797573d
......@@ -161,7 +161,7 @@ public class JdbcUtils {
if (StringUtils.isNullOrEmpty(driver)) {
JdbcUtils.load(url);
} else {
Class< ? > d = Utils.loadUserClass(driver);
Class<?> d = Utils.loadUserClass(driver);
if (java.sql.Driver.class.isAssignableFrom(d)) {
return DriverManager.getConnection(url, prop);
//## Java 1.4 begin ##
......
h2/src/main/org/h2/util/MathUtils.java
浏览文件 @ 1797573d
......@@ -142,7 +142,7 @@ public class MathUtils {
// host name and ip addresses (if any)
try {
// workaround for the Google App Engine: don't use InetAddress
Class< ? > inetAddressClass = Class.forName("java.net.InetAddress");
Class<?> inetAddressClass = Class.forName("java.net.InetAddress");
Object localHost = inetAddressClass.getMethod("getLocalHost").invoke(null);
String hostName = inetAddressClass.getMethod("getHostName").invoke(localHost).toString();
out.writeUTF(hostName);
......
h2/src/main/org/h2/util/SourceCompiler.java
浏览文件 @ 1797573d
......@@ -27,7 +27,7 @@ import org.h2.message.DbException;
*/
public class SourceCompiler {
private static final Class< ? > JAVAC_SUN;
private static final Class<?> JAVAC_SUN;
/**
* The class name to source code map.
......@@ -37,12 +37,12 @@ public class SourceCompiler {
/**
* The class name to byte code map.
*/
HashMap<String, Class< ? >> compiled = New.hashMap();
HashMap<String, Class<?>> compiled = New.hashMap();
private String compileDir = System.getProperty("java.io.tmpdir");
static {
Class< ? > clazz;
Class<?> clazz;
try {
clazz = Class.forName("com.sun.tools.javac.Main");
} catch (Exception e) {
......@@ -69,16 +69,16 @@ public class SourceCompiler {
* @param packageAndClassName the class name
* @return the class
*/
private Class< ? > getClass(String packageAndClassName) throws ClassNotFoundException {
private Class<?> getClass(String packageAndClassName) throws ClassNotFoundException {
Class< ? > compiledClass = compiled.get(packageAndClassName);
Class<?> compiledClass = compiled.get(packageAndClassName);
if (compiledClass != null) {
return compiledClass;
}
ClassLoader classLoader = new ClassLoader(getClass().getClassLoader()) {
public Class< ? > findClass(String name) throws ClassNotFoundException {
Class< ? > classInstance = compiled.get(name);
public Class<?> findClass(String name) throws ClassNotFoundException {
Class<?> classInstance = compiled.get(name);
if (classInstance == null) {
String source = sources.get(name);
String packageName = null;
......@@ -111,7 +111,7 @@ public class SourceCompiler {
* @return the method name
*/
public Method getMethod(String className) throws ClassNotFoundException {
Class< ? > clazz = getClass(className);
Class<?> clazz = getClass(className);
Method[] methods = clazz.getDeclaredMethods();
for (Method m : methods) {
int modifiers = m.getModifiers();
......
h2/src/main/org/h2/util/TempFileDeleter.java
浏览文件 @ 1797573d
......@@ -20,7 +20,7 @@ import org.h2.message.DbException;
public class TempFileDeleter {
private final ReferenceQueue<Object> queue = new ReferenceQueue<Object>();
private final HashMap<PhantomReference< ? >, String> refMap = New.hashMap();
private final HashMap<PhantomReference<?>, String> refMap = New.hashMap();
private TempFileDeleter() {
// utility class
......@@ -38,9 +38,9 @@ public class TempFileDeleter {
* @param file the object to monitor
* @return the reference that can be used to stop deleting the file
*/
public synchronized Reference< ? > addFile(String fileName, Object file) {
public synchronized Reference<?> addFile(String fileName, Object file) {
IOUtils.trace("TempFileDeleter.addFile", fileName, file);
PhantomReference< ? > ref = new PhantomReference<Object>(file, queue);
PhantomReference<?> ref = new PhantomReference<Object>(file, queue);
refMap.put(ref, fileName);
deleteUnused();
return ref;
......@@ -52,7 +52,7 @@ public class TempFileDeleter {
* @param ref the reference as returned by addFile
* @param fileName the file name
*/
public synchronized void deleteFile(Reference< ? > ref, String fileName) {
public synchronized void deleteFile(Reference<?> ref, String fileName) {
if (ref != null) {
String f2 = refMap.remove(ref);
if (f2 != null) {
......@@ -104,7 +104,7 @@ public class TempFileDeleter {
* @param ref the reference as returned by addFile
* @param fileName the file name
*/
public void stopAutoDelete(Reference< ? > ref, String fileName) {
public void stopAutoDelete(Reference<?> ref, String fileName) {
IOUtils.trace("TempFileDeleter.stopAutoDelete", fileName, ref);
if (ref != null) {
String f2 = refMap.remove(ref);
......
h2/src/main/org/h2/util/Utils.java
浏览文件 @ 1797573d
......@@ -391,7 +391,7 @@ public class Utils {
* @param className the name of the class
* @return the class object
*/
public static Class< ? > loadUserClass(String className) {
public static Class<?> loadUserClass(String className) {
if (!ALLOW_ALL_CLASSES && !ALLOWED_CLASS_NAMES.contains(className)) {
boolean allowed = false;
for (String s : ALLOWED_CLASS_NAME_PREFIXES) {
......
h2/src/main/org/h2/value/DataType.java
浏览文件 @ 1797573d
......@@ -776,7 +776,7 @@ public class DataType {
* @param x the Java class
* @return the value type
*/
public static int getTypeFromClass(Class < ? > x) {
public static int getTypeFromClass(Class <?> x) {
// TODO refactor: too many if/else in functions, can reduce!
if (x == null || Void.TYPE == x) {
return Value.NULL;
......@@ -1011,7 +1011,7 @@ public class DataType {
* @param clazz the Java class
* @return the default object
*/
public static Object getDefaultForPrimitiveType(Class< ? > clazz) {
public static Object getDefaultForPrimitiveType(Class<?> clazz) {
if (clazz == Boolean.TYPE) {
return Boolean.FALSE;
} else if (clazz == Byte.TYPE) {
......@@ -1041,7 +1041,7 @@ public class DataType {
* @param paramClass the target class
* @return the converted object
*/
public static Object convertTo(SessionInterface session, JdbcConnection conn, Value v, Class< ? > paramClass) {
public static Object convertTo(SessionInterface session, JdbcConnection conn, Value v, Class<?> paramClass) {
if (paramClass == Blob.class) {
return new JdbcBlob(conn, v, 0);
} else if (paramClass == Clob.class) {
......
h2/src/test/org/h2/test/TestAll.java
浏览文件 @ 1797573d
......@@ -663,7 +663,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
private void runTest(String className) {
try {
Class< ? > clazz = Class.forName(className);
Class<?> clazz = Class.forName(className);
TestBase test = (TestBase) clazz.newInstance();
test.runTest(this);
} catch (Exception e) {
......
h2/src/test/org/h2/test/bench/Database.java
浏览文件 @ 1797573d
......@@ -101,7 +101,7 @@ class Database {
Thread.sleep(100);
} else if (url.startsWith("jdbc:hsqldb:hsql:")) {
if (!serverHSQLDB) {
Class< ? > c;
Class<?> c;
try {
c = Class.forName("org.hsqldb.server.Server");
} catch (Exception e) {
......
h2/src/test/org/h2/test/synth/TestCrashAPI.java
浏览文件 @ 1797573d
......@@ -54,14 +54,14 @@ public class TestCrashAPI extends TestBase implements Runnable {
private static final boolean RECOVER_ALL = false;
private static final Class< ? >[] INTERFACES = { Connection.class, PreparedStatement.class, Statement.class,
private static final Class<?>[] INTERFACES = { Connection.class, PreparedStatement.class, Statement.class,
ResultSet.class, ResultSetMetaData.class, Savepoint.class,
ParameterMetaData.class, Clob.class, Blob.class, Array.class, CallableStatement.class };
private static final String DIR = "synth";
private ArrayList<Object> objects = New.arrayList();
private HashMap<Class < ? >, ArrayList<Method>> classMethods = New.hashMap();
private HashMap<Class <?>, ArrayList<Method>> classMethods = New.hashMap();
private RandomGen random = new RandomGen();
private ArrayList<String> statements = New.arrayList();
private int openCount;
......@@ -320,7 +320,7 @@ public class TestCrashAPI extends TestBase implements Runnable {
objects.remove(objectId);
continue;
}
Class< ? > in = getJdbcInterface(o);
Class<?> in = getJdbcInterface(o);
ArrayList<Method> methods = classMethods.get(in);
Method m = methods.get(random.getInt(methods.size()));
Object o2 = callRandom(seed, i, objectId, o, m);
......@@ -356,7 +356,7 @@ public class TestCrashAPI extends TestBase implements Runnable {
}
private Object callRandom(int seed, int id, int objectId, Object o, Method m) {
Class< ? >[] paramClasses = m.getParameterTypes();
Class<?>[] paramClasses = m.getParameterTypes();
Object[] params = new Object[paramClasses.length];
for (int i = 0; i < params.length; i++) {
params[i] = getRandomParam(paramClasses[i]);
......@@ -376,7 +376,7 @@ public class TestCrashAPI extends TestBase implements Runnable {
if (result == null) {
return null;
}
Class< ? > in = getJdbcInterface(result);
Class<?> in = getJdbcInterface(result);
if (in == null) {
return null;
}
......@@ -408,7 +408,7 @@ public class TestCrashAPI extends TestBase implements Runnable {
}
}
private Object getRandomParam(Class< ? > type) {
private Object getRandomParam(Class<?> type) {
if (type == int.class) {
return new Integer(random.getRandomInt());
} else if (type == byte.class) {
......@@ -478,8 +478,8 @@ public class TestCrashAPI extends TestBase implements Runnable {
return null;
}
private Class< ? > getJdbcInterface(Object o) {
for (Class < ? > in : o.getClass().getInterfaces()) {
private Class<?> getJdbcInterface(Object o) {
for (Class <?> in : o.getClass().getInterfaces()) {
if (classMethods.get(in) != null) {
return in;
}
......@@ -488,10 +488,10 @@ public class TestCrashAPI extends TestBase implements Runnable {
}
private void initMethods() {
for (Class< ? > inter : INTERFACES) {
for (Class<?> inter : INTERFACES) {
classMethods.put(inter, new ArrayList<Method>());
}
for (Class< ? > inter : INTERFACES) {
for (Class<?> inter : INTERFACES) {
ArrayList<Method> list = classMethods.get(inter);
for (Method m : inter.getMethods()) {
list.add(m);
......
h2/src/test/org/h2/test/trace/Arg.java
浏览文件 @ 1797573d
......@@ -29,11 +29,11 @@ import org.h2.util.StringUtils;
* An argument of a statement.
*/
class Arg {
private Class< ? > clazz;
private Class<?> clazz;
private Object obj;
private Statement stat;
Arg(Class< ? > clazz, Object obj) {
Arg(Class<?> clazz, Object obj) {
this.clazz = clazz;
this.obj = obj;
}
......@@ -60,7 +60,7 @@ class Arg {
}
}
Class< ? > getValueClass() {
Class<?> getValueClass() {
return clazz;
}
......@@ -68,7 +68,7 @@ class Arg {
return obj;
}
private String quote(Class< ? > valueClass, Object value) {
private String quote(Class<?> valueClass, Object value) {
if (value == null) {
return null;
} else if (valueClass == String.class) {
......
h2/src/test/org/h2/test/trace/Player.java
浏览文件 @ 1797573d
......@@ -145,7 +145,7 @@ public class Player {
* @param className the class name
* @return the class
*/
static Class< ? > getClass(String className) {
static Class<?> getClass(String className) {
for (String s : IMPORTED_PACKAGES) {
try {
return Class.forName(s + className);
......
h2/src/test/org/h2/test/trace/Statement.java
浏览文件 @ 1797573d
......@@ -39,7 +39,7 @@ class Statement {
private Object object;
private String methodName;
private Arg[] args;
private Class< ? > returnClass;
private Class<?> returnClass;
Statement(Player player) {
this.player = player;
......@@ -59,13 +59,13 @@ class Statement {
}
return null;
}
Class< ? > clazz;
Class<?> clazz;
if (staticCall) {
clazz = Player.getClass(staticCallClass);
} else {
clazz = object.getClass();
}
Class< ? >[] parameterTypes = new Class[args.length];
Class<?>[] parameterTypes = new Class[args.length];
Object[] parameters = new Object[args.length];
for (int i = 0; i < args.length; i++) {
Arg arg = args[i];
......@@ -121,7 +121,7 @@ class Statement {
return buff.toString();
}
Class< ? > getReturnClass() {
Class<?> getReturnClass() {
return returnClass;
}
......
h2/src/test/org/h2/test/unit/TestClearReferences.java
浏览文件 @ 1797573d
......@@ -52,9 +52,9 @@ public class TestClearReferences extends TestBase {
// initialize the known classes
MathUtils.secureRandomLong();
ArrayList<Class < ? >> classes = New.arrayList();
ArrayList<Class <?>> classes = New.arrayList();
check(classes, new File("bin/org/h2"));
for (Class< ? > clazz : classes) {
for (Class<?> clazz : classes) {
clearClass(clazz);
}
if (hasError) {
......@@ -62,7 +62,7 @@ public class TestClearReferences extends TestBase {
}
}
private void check(ArrayList<Class < ? >> classes, File file) {
private void check(ArrayList<Class <?>> classes, File file) {
String name = file.getName();
if (file.isDirectory()) {
if (name.equals("CVS") || name.equals(".svn")) {
......@@ -83,7 +83,7 @@ public class TestClearReferences extends TestBase {
}
className = className.replace('/', '.');
className = className.substring(0, className.length() - ".class".length());
Class< ? > clazz = null;
Class<?> clazz = null;
try {
clazz = Class.forName(className);
} catch (ClassNotFoundException e) {
......@@ -100,7 +100,7 @@ public class TestClearReferences extends TestBase {
*
* @param clazz the class to clear
*/
private void clearClass(Class< ? > clazz) throws Exception {
private void clearClass(Class<?> clazz) throws Exception {
for (Field field : clazz.getDeclaredFields()) {
if (field.getType().isPrimitive() || field.getName().indexOf("$") != -1) {
continue;
......
h2/src/test/org/h2/test/unit/TestOldVersion.java
浏览文件 @ 1797573d
......@@ -35,7 +35,7 @@ public class TestOldVersion extends TestBase {
URL[] urls = { new URL("file:ext/h2-1.2.127.jar") };
ClassLoader cl = new URLClassLoader(urls, null);
// cl = getClass().getClassLoader();
Class< ? > driverClass;
Class<?> driverClass;
try {
driverClass = cl.loadClass("org.h2.Driver");
} catch (ClassNotFoundException e) {
......@@ -55,7 +55,7 @@ public class TestOldVersion extends TestBase {
}
server.stop();
Class< ? > serverClass = cl.loadClass("org.h2.tools.Server");
Class<?> serverClass = cl.loadClass("org.h2.tools.Server");
m = serverClass.getMethod("createTcpServer", String[].class);
Object serverOld = m.invoke(null, new Object[]{new String[]{"-tcpPort", "9001"}});
m = serverOld.getClass().getMethod("start");
......
h2/src/test/org/h2/test/unit/TestSampleApps.java
浏览文件 @ 1797573d
......@@ -73,7 +73,7 @@ public class TestSampleApps extends TestBase {
IOUtils.delete(getBaseDir() + "/optimizations.sql");
}
private void testApp(String expected, Class< ? > clazz, String... args) throws Exception {
private void testApp(String expected, Class<?> clazz, String... args) throws Exception {
DeleteDbFiles.execute("data", "test", true);
Method m = clazz.getMethod("main", String[].class);
PrintStream oldOut = System.out, oldErr = System.err;
......
h2/src/test/org/h2/test/unit/TestTools.java
浏览文件 @ 1797573d
......@@ -162,7 +162,7 @@ public class TestTools extends TestBase {
int len = m.getParameterTypes().length;
Object[] params = new Object[len];
int i = 0;
for (Class< ? > type : m.getParameterTypes()) {
for (Class<?> type : m.getParameterTypes()) {
Object o = null;
if (type == int.class) {
o = 1;
......
h2/src/tools/org/h2/build/BuildBase.java
浏览文件 @ 1797573d
......@@ -369,7 +369,7 @@ public class BuildBase {
*/
protected String getStaticField(String className, String fieldName) {
try {
Class< ? > clazz = Class.forName(className);
Class<?> clazz = Class.forName(className);
Field field = clazz.getField(fieldName);
return field.get(null).toString();
} catch (Exception e) {
......@@ -386,7 +386,7 @@ public class BuildBase {
*/
protected String getStaticValue(String className, String methodName) {
try {
Class< ? > clazz = Class.forName(className);
Class<?> clazz = Class.forName(className);
Method method = clazz.getMethod(methodName);
return method.invoke(null).toString();
} catch (Exception e) {
......@@ -472,7 +472,7 @@ public class BuildBase {
"Building "
}));
}
Class< ? > clazz = Class.forName("com.sun.tools.javadoc.Main");
Class<?> clazz = Class.forName("com.sun.tools.javadoc.Main");
Method execute = clazz.getMethod("execute", String[].class);
result = (Integer) invoke(execute, null, new Object[] { args });
} catch (Exception e) {
......@@ -769,13 +769,13 @@ public class BuildBase {
int result;
PrintStream old = System.err;
try {
Class< ? > clazz = Class.forName("com.sun.tools.javac.Main");
Class<?> clazz = Class.forName("com.sun.tools.javac.Main");
if (quiet) {
System.setErr(filter(System.err, new String[] {
"Note:"
}));
}
Method compile = clazz.getMethod("compile", new Class< ? >[] { String[].class });
Method compile = clazz.getMethod("compile", new Class<?>[] { String[].class });
Object instance = clazz.newInstance();
result = (Integer) invoke(compile, instance, new Object[] { array });
} catch (Exception e) {
......
h2/src/tools/org/h2/jaqu/Db.java
浏览文件 @ 1797573d
......@@ -32,7 +32,7 @@ public class Db {
Utils.newWeakIdentityHashMap();
private final Connection conn;
private final Map<Class< ? >, TableDefinition< ? >> classMap =
private final Map<Class<?>, TableDefinition<?>> classMap =
Utils.newHashMap();
Db(Connection conn) {
......@@ -97,22 +97,22 @@ public class Db {
}
public <T> void insert(T t) {
Class< ? > clazz = t.getClass();
Class<?> clazz = t.getClass();
define(clazz).createTableIfRequired(this).insert(this, t);
}
public <T> void merge(T t) {
Class< ? > clazz = t.getClass();
Class<?> clazz = t.getClass();
define(clazz).createTableIfRequired(this).merge(this, t);
}
public <T> void update(T t) {
Class< ? > clazz = t.getClass();
Class<?> clazz = t.getClass();
define(clazz).createTableIfRequired(this).update(this, t);
}
public <T extends Object> Query<T> from(T alias) {
Class< ? > clazz = alias.getClass();
Class<?> clazz = alias.getClass();
define(clazz).createTableIfRequired(this);
return Query.from(this, alias);
}
......
h2/src/tools/org/h2/jaqu/Define.java
浏览文件 @ 1797573d
......@@ -13,7 +13,7 @@ package org.h2.jaqu;
//## Java 1.5 begin ##
public class Define {
private static TableDefinition< ? > currentTableDefinition;
private static TableDefinition<?> currentTableDefinition;
private static Table currentTable;
public static void primaryKey(Object... columns) {
......
h2/src/tools/org/h2/jaqu/Query.java
浏览文件 @ 1797573d
......@@ -31,7 +31,7 @@ public class Query<T> {
private Db db;
private SelectTable<T> from;
private ArrayList<Token> conditions = Utils.newArrayList();
private ArrayList<SelectTable< ? >> joins = Utils.newArrayList();
private ArrayList<SelectTable<?>> joins = Utils.newArrayList();
private final IdentityHashMap<Object, SelectColumn<T>> aliasMap = Utils.newIdentityHashMap();
private ArrayList<OrderExpression<T>> orderByList = Utils.newArrayList();
private Object[] groupByExpressions;
......@@ -125,7 +125,7 @@ public class Query<T> {
@SuppressWarnings("unchecked")
private <X, Z> List<X> select(Z x, boolean distinct) {
Class< ? > clazz = x.getClass();
Class<?> clazz = x.getClass();
if (Utils.isSimpleType(clazz)) {
return getSimple((X) x, distinct);
}
......
h2/src/tools/org/h2/jaqu/QueryJoin.java
浏览文件 @ 1797573d
......@@ -12,10 +12,10 @@ package org.h2.jaqu;
//## Java 1.5 begin ##
public class QueryJoin {
private Query< ? > query;
private SelectTable< ? > join;
private Query<?> query;
private SelectTable<?> join;
QueryJoin(Query< ? > query, SelectTable< ? > join) {
QueryJoin(Query<?> query, SelectTable<?> join) {
this.query = query;
this.join = join;
}
......
h2/src/tools/org/h2/jaqu/QueryJoinCondition.java
浏览文件 @ 1797573d
......@@ -14,17 +14,17 @@ package org.h2.jaqu;
//## Java 1.5 begin ##
public class QueryJoinCondition<A> {
private Query< ? > query;
private SelectTable< ? > join;
private Query<?> query;
private SelectTable<?> join;
private A x;
QueryJoinCondition(Query< ? > query, SelectTable< ? > join, A x) {
QueryJoinCondition(Query<?> query, SelectTable<?> join, A x) {
this.query = query;
this.join = join;
this.x = x;
}
public Query< ? > is(A y) {
public Query<?> is(A y) {
join.addConditionToken(new Condition<A>(x, y, CompareType.EQUAL));
return query;
}
......
h2/src/tools/org/h2/jaqu/TableDefinition.java
浏览文件 @ 1797573d
......@@ -153,7 +153,7 @@ class TableDefinition<T> {
}
private String getDataType(Field field) {
Class< ? > fieldClass = field.getType();
Class<?> fieldClass = field.getType();
if (fieldClass == Integer.class) {
return "INT";
} else if (fieldClass == String.class) {
......
h2/src/tools/org/h2/jaqu/bytecode/ClassReader.java
浏览文件 @ 1797573d
......@@ -47,7 +47,7 @@ public class ClassReader {
public Token decompile(Object instance, Map<String, Object> fields, String method) {
this.fieldMap = fields;
this.convertMethodName = method;
Class< ? > clazz = instance.getClass();
Class<?> clazz = instance.getClass();
String className = clazz.getName();
debug("class name " + className);
ByteArrayOutputStream buff = new ByteArrayOutputStream();
......
h2/src/tools/org/h2/jaqu/util/ClassUtils.java
浏览文件 @ 1797573d
......@@ -24,7 +24,7 @@ public class ClassUtils {
return (Class<X>) x.getClass();
}
public static Class< ? > loadClass(String className) {
public static Class<?> loadClass(String className) {
try {
return Class.forName(className);
} catch (Exception e) {
......
h2/src/tools/org/h2/jaqu/util/Utils.java
浏览文件 @ 1797573d
......@@ -125,11 +125,11 @@ public class Utils {
return false;
}
public static Object convert(Object o, Class< ? > targetType) {
public static Object convert(Object o, Class<?> targetType) {
if (o == null) {
return null;
}
Class< ? > currentType = o.getClass();
Class<?> currentType = o.getClass();
if (targetType.isAssignableFrom(currentType)) {
return o;
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论