This is an automated email from the ASF dual-hosted git repository.
liuxun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 8cfe9f7 [SUBMARINE-204] Optimize the tryResourceClose
8cfe9f7 is described below
commit 8cfe9f79f67b3f0a607e64bcea09e9a92d79cb0b
Author: Linhao Zhu <[email protected]>
AuthorDate: Tue Oct 1 22:41:42 2019 +0800
[SUBMARINE-204] Optimize the tryResourceClose
### What is this PR for?
Refer to the Java code
specification:https://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html,
Write the resources that need to be closed in the try block instead of
manually closing them in finally.
### What type of PR is it?
[ Improvement ]
### Todos
* [ ] - Task
### What is the Jira issue?
* [SUBMARINE-204](https://issues.apache.org/jira/browse/SUBMARINE-204)
### How should this be tested?
* [CI
Pass](https://travis-ci.org/LinhaoZhu/hadoop-submarine/builds/592062347)
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Linhao Zhu <[email protected]>
Author: LinhaoZhu <[email protected]>
Closes #29 from LinhaoZhu/SUBMARINE-204 and squashes the following commits:
fe94626 [LinhaoZhu] [SUBMARINE-204] Optimize the tryResourceClose
394ead6 [LinhaoZhu] Merge branch 'master' of
https://github.com/LinhaoZhu/hadoop-submarine
e960433 [Linhao Zhu] Merge pull request #4 from apache/master
8380fef [LinhaoZhu] Merge branch 'master' of
https://github.com/apache/hadoop-submarine
787c1e4 [Linhao Zhu] Merge pull request #3 from apache/master
5dd7e69 [Linhao Zhu] Merge pull request #2 from apache/master
d70f4ad [Linhao Zhu] Merge pull request #1 from apache/master
---
.../database/service/SysDictItemService.java | 8 +---
.../database/service/SysMessageService.java | 7 +---
.../submarine/database/service/SysUserService.java | 43 ++++------------------
.../database/service/TeamMemberService.java | 18 ++-------
.../submarine/database/service/TeamService.java | 24 ++----------
5 files changed, 17 insertions(+), 83 deletions(-)
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysDictItemService.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysDictItemService.java
index 2a93f72..082894e 100644
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysDictItemService.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysDictItemService.java
@@ -27,18 +27,14 @@ public class SysDictItemService {
private static final Logger LOG =
LoggerFactory.getLogger(SysDictRestApi.class);
public List<SysDictItem> queryDictByCode(String dictCode) {
- SqlSession sqlSession = MyBatisUtil.getSqlSession();
- SysDictItemMapper dictItemMapper =
sqlSession.getMapper(SysDictItemMapper.class);
-
List<SysDictItem> dictItems = null;
- try {
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
+ SysDictItemMapper dictItemMapper =
sqlSession.getMapper(SysDictItemMapper.class);
dictItems = dictItemMapper.queryDictByCode(dictCode);
sqlSession.commit();
} catch (Exception e) {
LOG.error(e.getMessage(), e);
return null;
- } finally {
- sqlSession.close();
}
return dictItems;
}
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysMessageService.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysMessageService.java
index 2ca57ed..b8a3716 100644
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysMessageService.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysMessageService.java
@@ -26,18 +26,13 @@ public class SysMessageService {
public void add(SysMessage sysMessage) throws Exception {
LOG.info("add({})", sysMessage.toString());
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
SysMessageMapper sysMessageMapper =
sqlSession.getMapper(SysMessageMapper.class);
sysMessageMapper.insert(sysMessage);
sqlSession.commit();
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
}
-
}
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysUserService.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysUserService.java
index cdd1e2b..789d6b1 100755
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysUserService.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/SysUserService.java
@@ -33,8 +33,7 @@ public class SysUserService {
public SysUser getUserByName(String name, String password) throws Exception {
SysUser sysUser = null;
- SqlSession sqlSession = MyBatisUtil.getSqlSession();
- try {
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
HashMap<String, Object> mapParams = new HashMap<>();
mapParams.put("name", name);
mapParams.put("password", password);
@@ -46,25 +45,18 @@ public class SysUserService {
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
-
return sysUser;
}
public SysUser login(HashMap<String, String> mapParams) throws Exception {
- SqlSession sqlSession = null;
SysUser sysUser = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
SysUserMapper sysUserMapper = sqlSession.getMapper(SysUserMapper.class);
sysUser = sysUserMapper.login(mapParams);
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return sysUser;
}
@@ -81,9 +73,7 @@ public class SysUserService {
userName, email, deptCode, column, field, pageNo, pageSize);
List<SysUser> list = null;
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
SysUserMapper sysUserMapper = sqlSession.getMapper(SysUserMapper.class);
Map<String, Object> where = new HashMap<>();
where.put("userName", userName);
@@ -93,78 +83,59 @@ public class SysUserService {
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
-
return list;
}
public boolean add(SysUser sysUser) throws Exception {
LOG.info("add({})", sysUser.toString());
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
SysUserMapper userMapper = sqlSession.getMapper(SysUserMapper.class);
userMapper.add(sysUser);
sqlSession.commit();
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return true;
}
public boolean edit(SysUser sysUser) throws Exception {
LOG.info("edit({})", sysUser.toString());
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
SysUserMapper userMapper = sqlSession.getMapper(SysUserMapper.class);
userMapper.updateBy(sysUser);
sqlSession.commit();
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return true;
}
public boolean delete(String id) throws Exception {
LOG.info("delete({})", id.toString());
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
SysUserMapper userMapper = sqlSession.getMapper(SysUserMapper.class);
userMapper.deleteById(id);
sqlSession.commit();
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return true;
}
public boolean changePassword(SysUser user) throws Exception {
LOG.info("changePassword({})", user.toString());
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
SysUserMapper userMapper = sqlSession.getMapper(SysUserMapper.class);
userMapper.changePassword(user);
sqlSession.commit();
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return true;
}
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
index 098eb41..493ae7f 100644
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamMemberService.java
@@ -31,9 +31,7 @@ public class TeamMemberService {
LOG.info("queryList teamId:{}", teamId);
List<TeamMember> list = null;
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
TeamMemberMapper teamMemberMapper =
sqlSession.getMapper(TeamMemberMapper.class);
Map<String, Object> where = new HashMap<>();
where.put("teamId", teamId);
@@ -41,8 +39,6 @@ public class TeamMemberService {
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return list;
}
@@ -50,9 +46,7 @@ public class TeamMemberService {
public boolean insertSelective(TeamMember teamMember) throws Exception {
LOG.info("insertSelective({})", teamMember.toString());
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
TeamMemberMapper teamMemberMapper =
sqlSession.getMapper(TeamMemberMapper.class);
teamMemberMapper.insertSelective(teamMember);
@@ -60,8 +54,6 @@ public class TeamMemberService {
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return true;
}
@@ -69,17 +61,13 @@ public class TeamMemberService {
public void deleteByPrimaryKey(String id) throws Exception {
LOG.info("deleteByPrimaryKey({})", id);
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
TeamMemberMapper teamMemberMapper =
sqlSession.getMapper(TeamMemberMapper.class);
teamMemberMapper.deleteByPrimaryKey(id);
sqlSession.commit();
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
}
}
diff --git
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
index 7f3d079..5e2692e 100644
---
a/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
+++
b/submarine-workbench/workbench-server/src/main/java/org/apache/submarine/database/service/TeamService.java
@@ -40,9 +40,7 @@ public class TeamService {
owner, column, order, pageNo, pageSize);
List<Team> list = null;
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
TeamMapper teamMapper = sqlSession.getMapper(TeamMapper.class);
Map<String, Object> where = new HashMap<>();
where.put("owner", owner);
@@ -63,8 +61,6 @@ public class TeamService {
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return list;
}
@@ -72,9 +68,7 @@ public class TeamService {
public boolean add(Team team) throws Exception {
LOG.info("add({})", team.toString());
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
TeamMapper teamMapper = sqlSession.getMapper(TeamMapper.class);
teamMapper.insert(team);
@@ -91,8 +85,6 @@ public class TeamService {
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return true;
}
@@ -100,9 +92,7 @@ public class TeamService {
public boolean updateByPrimaryKeySelective(Team team) throws Exception {
LOG.info("updateByPrimaryKeySelective({})", team.toString());
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
TeamMapper teamMapper = sqlSession.getMapper(TeamMapper.class);
teamMapper.updateByPrimaryKeySelective(team);
@@ -148,17 +138,13 @@ public class TeamService {
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return true;
}
public boolean delete(String id) throws Exception {
LOG.info("delete({})", id);
- SqlSession sqlSession = null;
- try {
- sqlSession = MyBatisUtil.getSqlSession();
+ try (SqlSession sqlSession = MyBatisUtil.getSqlSession()) {
TeamMapper teamMapper = sqlSession.getMapper(TeamMapper.class);
teamMapper.deleteByPrimaryKey(id);
@@ -170,8 +156,6 @@ public class TeamService {
} catch (Exception e) {
LOG.error(e.getMessage(), e);
throw new Exception(e);
- } finally {
- sqlSession.close();
}
return true;
}
