This commit is contained in:
Looly 2022-09-13 23:22:20 +08:00
parent 3473084b94
commit adb1dc5f62
2 changed files with 12 additions and 0 deletions

View File

@ -123,8 +123,18 @@ public class ObjUtilTest {
Assert.assertSame(val1, ObjUtil.defaultIfNull(val1, Function.identity(), val2)); Assert.assertSame(val1, ObjUtil.defaultIfNull(val1, Function.identity(), val2));
Assert.assertSame(val2, ObjUtil.defaultIfNull(null, Function.identity(), val2)); Assert.assertSame(val2, ObjUtil.defaultIfNull(null, Function.identity(), val2));
SerializableBean obj = new SerializableBean(null);
SerializableBean objNull = null;
String result3 = ObjUtil.defaultIfNull(obj, Object::toString, "fail");
Assert.assertNotNull(result3);
String result4 = ObjUtil.defaultIfNull(objNull, Object::toString, () -> "fail");
Assert.assertNotNull(result4);
} }
@Test @Test
public void cloneTest() { public void cloneTest() {
Assert.assertNull(ObjUtil.clone(null)); Assert.assertNull(ObjUtil.clone(null));

View File

@ -103,6 +103,8 @@ public class DialectFactory implements DriverNamePool{
driver = DRIVER_SQLLITE3; driver = DRIVER_SQLLITE3;
} else if (nameContainsProductInfo.contains("sqlserver") || nameContainsProductInfo.contains("microsoft")) { } else if (nameContainsProductInfo.contains("sqlserver") || nameContainsProductInfo.contains("microsoft")) {
driver = DRIVER_SQLSERVER; driver = DRIVER_SQLSERVER;
} else if (nameContainsProductInfo.contains("hive2")) {
driver = DRIVER_HIVE2;
} else if (nameContainsProductInfo.contains("hive")) { } else if (nameContainsProductInfo.contains("hive")) {
driver = DRIVER_HIVE; driver = DRIVER_HIVE;
} else if (nameContainsProductInfo.contains("h2")) { } else if (nameContainsProductInfo.contains("h2")) {