0.9.3发布前最终优化代码；

Author: limeng32

src/main/java/indi/mybatis/flying/models/TypeJdbcTypeConverter.java

@@ -8,7 +8,7 @@
 
 public class TypeJdbcTypeConverter {
 
-	protected final static Map<Class<?>, JdbcType> map = new HashMap<>(128);
+	protected final static Map<Class<?>, JdbcType> map = new HashMap<>(8);
 
 	static {
 		map.put(String.class, JdbcType.VARCHAR);

src/main/java/indi/mybatis/flying/utils/JdbcTypeEnum.java

@@ -53,7 +53,7 @@ private JdbcTypeEnum(JdbcType jdbcType) {
 		this.jdbcType = jdbcType;
 	}
 
-	private static Map<String,JdbcType> nameLookup = new HashMap<>();
+	private static final Map<String,JdbcType> nameLookup = new HashMap<>(64);
 
 	static {
 		for (JdbcTypeEnum jdbcTypeEnum : JdbcTypeEnum.values()) {

src/test/java/indi/mybatis/flying/test/AccountTest.java

@@ -105,7 +105,7 @@ public void testDataSource() {
 			@DatabaseTearDown(connection = "dataSource2", type = DatabaseOperation.DELETE_ALL, value = "/indi/mybatis/flying/test/accountTest/testInsert.datasource2.result.xml") })
 	public void testInsert() {
 		Account_ a = new Account_();
-		a.setId(1l);
+		a.setId(1L);
 		a.setName("ann");
 		a.setEmail("ann@live.cn");
 		a.setPassword("5a690d842935c51f26f473e025c1b97a");

src/test/java/indi/mybatis/flying/test/AccountTypeHandlerTest.java

@@ -81,7 +81,7 @@ public void testAccountTypeHandler() {
 		Assert.assertEquals("ann@live.cn", longinLogSource.getAccount().getEmail());
 
 		Account_ ac = new Account_();
-		ac.setId(1l);
+		ac.setId(1L);
 		LoginLogSource2 l2c = new LoginLogSource2();
 		l2c.setAccount(ac);
 		Collection<LoginLogSource2> loginLogSource2C = loginLogSource2Service.selectAll(l2c);
@@ -97,14 +97,14 @@ public void testAccountTypeHandler() {
 		Assert.assertNull(loginLogSource3.getAccount());
 
 		Account_ ac2 = new Account_();
-		ac2.setId(2l);
+		ac2.setId(2L);
 		LoginLogSource2 l2c2 = new LoginLogSource2();
 		l2c2.setAccount(ac2);
 		LoginLogSource2 loginLogSource4 = loginLogSource2Service.selectOne(l2c2);
 		Assert.assertEquals("bob@live.cn", loginLogSource4.getAccount().getEmail());
 
 		Account_ ac3 = new Account_();
-		ac3.setId(1l);
+		ac3.setId(1L);
 		LoginLogSource2 l2c3 = new LoginLogSource2();
 		l2c3.setAccount(ac3);
 		l2c3.setLoginIP("ip1");

src/test/java/indi/mybatis/flying/test/CacheTest.java

@@ -210,22 +210,22 @@ public void testPagination() {
 		String name1 = "ann", name2 = "bob", name3 = "carl", name4 = "duke";
 
 		Account_ a1 = new Account_();
-		a1.setId(1l);
+		a1.setId(1L);
 		a1.setName(name1);
 		accountService.insert(a1);
 
 		Account_ a2 = new Account_();
-		a2.setId(2l);
+		a2.setId(2L);
 		a2.setName(name2);
 		accountService.insert(a2);
 
 		Account_ a3 = new Account_();
-		a3.setId(3l);
+		a3.setId(3L);
 		a3.setName(name3);
 		accountService.insert(a3);
 
 		Account_ a4 = new Account_();
-		a4.setId(4l);
+		a4.setId(4L);
 		a4.setName(name4);
 		accountService.insert(a4);
 
@@ -569,7 +569,7 @@ public void testUpdateDirect() {
 		r.setName("ann");
 		roleService.insert(r);
 		Account_ a = new Account_();
-		a.setId(1l);
+		a.setId(1L);
 		a.setRole(r);
 		a.setEmail("email");
 		accountService.insert(a);
@@ -597,7 +597,7 @@ public void testUpdateDirect2() {
 		r.setName("ann");
 		roleService.insert(r);
 		Account_ a = new Account_();
-		a.setId(1l);
+		a.setId(1L);
 		a.setRole(r);
 		a.setEmail("email");
 		accountService.insert(a);
@@ -630,7 +630,7 @@ public void testUpdateDirect3() {
 		r.setName("ann");
 		roleService.insert(r);
 		Account_ a = new Account_();
-		a.setId(1l);
+		a.setId(1L);
 		a.setRole(r);
 		a.setEmail("email");
 		accountService.insert(a);
@@ -663,7 +663,7 @@ public void testUpdateDirect4() {
 		r.setName("ann");
 		roleService.insert(r);
 		Account_ a = new Account_();
-		a.setId(1l);
+		a.setId(1L);
 		a.setRole(r);
 		a.setEmail("email");
 		accountService.insert(a);
@@ -766,7 +766,7 @@ public void testSameIdAndInjectionInDifferentPojos() {
 		roleService.insert(r);
 
 		Account_ a = new Account_();
-		a.setId(1l);
+		a.setId(1L);
 		a.setName("deployer");
 		accountService.insert(a);
 
@@ -804,7 +804,7 @@ public void testSelectWithoutRole() {
 		roleService.insert(r2);
 
 		Account_ a = new Account_();
-		a.setId(1l);
+		a.setId(1L);
 		a.setRole(r);
 		a.setRoleDeputy(r2);
 		a.setName("deployer");

src/test/java/indi/mybatis/flying/test/OrTest.java

@@ -248,7 +248,7 @@ public void testOr6() {
 	public void testOr2() {
 		LoginLog_Condition lc = new LoginLog_Condition();
 		lc.setAccount(new Account_Condition());
-		((Account_Condition) lc.getAccount()).setIdEqualsOr(1l, 2l);
+		((Account_Condition) lc.getAccount()).setIdEqualsOr(1L, 2L);
 		int i = loginLogService.count(lc);
 		Assert.assertEquals(4, i);
 	}
@@ -263,9 +263,9 @@ public void testOr7() {
 		// loginLogSource2.setAccount(new Account_Condition());
 		// ((Account_Condition)loginLogSource2.getAccount()).setIdEqualsOr(1,2);
 		Account_ ac1 = new Account_();
-		ac1.setId(1l);
+		ac1.setId(1L);
 		Account_ ac2 = new Account_();
-		ac2.setId(2l);
+		ac2.setId(2L);
 		loginLogSource2.setAccountEqualsOr(ac1, ac2);
 		int i = loginLogSource2Service.count(loginLogSource2);
 		Assert.assertEquals(4, i);
@@ -286,9 +286,9 @@ public void testOr7() {
 	public void testOrMashup() {
 		LoginLogSource2Condition l2c = new LoginLogSource2Condition();
 		Account_ a1 = new Account_();
-		a1.setId(1l);
+		a1.setId(1L);
 		Account_ a2 = new Account_();
-		a2.setId(2l);
+		a2.setId(2L);
 		l2c.setAccountEqualsOr2(a1, a2, "23453");
 		int i1 = loginLogSource2Service.count(l2c);
 		Assert.assertEquals(3, i1);

src/test/java/indi/mybatis/flying/test/ThreadTest.java

@@ -73,8 +73,8 @@ public void testExampleThread() throws Throwable {
 
 		// 实例化 TestRunnable 类
 		TestRunnable tr1, tr2;
-		tr1 = new accountInsert(2l, "ann");
-		tr2 = new accountInsert(3l, "ann");
+		tr1 = new accountInsert(2L, "ann");
+		tr2 = new accountInsert(3L, "ann");
 		// 把实例传递给 MTTR
 		TestRunnable[] trs = { tr1, tr2 };
 		MultiThreadedTestRunner mttr = new MultiThreadedTestRunner(trs);