Skip to content

Commit 5a58aac

Browse files
pivovaritpivovarit
committed
Refactor
1 parent d46af17 commit 5a58aac

File tree

3 files changed

+137
-129
lines changed

3 files changed

+137
-129
lines changed

Diff for: ‎libraries/src/main/java/com/baeldung/hikaricp/DataSource.java

+38-39
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,47 @@
11
package com.baeldung.hikaricp;
22

3-
import java.io.PrintWriter;
4-
import java.sql.Connection;
5-
import java.sql.SQLException;
6-
import java.util.Properties;
7-
83
import com.zaxxer.hikari.HikariConfig;
94
import com.zaxxer.hikari.HikariDataSource;
105

6+
import java.sql.Connection;
7+
import java.sql.SQLException;
8+
119
public class DataSource {
1210

13-
private static HikariConfig config = new HikariConfig();
14-
private static HikariDataSource ds;
15-
16-
static {
17-
// config = new HikariConfig("datasource.properties");
18-
19-
// Properties props = new Properties();
20-
// props.setProperty("dataSourceClassName", "org.postgresql.ds.PGSimpleDataSource");
21-
// props.setProperty("dataSource.user", "postgres");
22-
// props.setProperty("dataSource.password", "postgres");
23-
// props.setProperty("dataSource.databaseName", "postgres");
24-
// props.setProperty("dataSource.portNumber", "5432");
25-
// props.setProperty("dataSource.serverName", "localhost");
26-
// props.put("dataSource.logWriter", new PrintWriter(System.out));
27-
// config = new HikariConfig(props);
28-
29-
config.setJdbcUrl("jdbc:postgresql://localhost:5432/postgres");
30-
config.setUsername("postgres");
31-
config.setPassword("postgres");
32-
config.addDataSourceProperty("cachePrepStmts", "true");
33-
config.addDataSourceProperty("prepStmtCacheSize", "250");
34-
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
35-
ds = new HikariDataSource(config);
36-
37-
// ds.setJdbcUrl("jdbc:postgresql://localhost:5432/postgres");
38-
// ds.setUsername("postgres");
39-
// ds.setPassword("postgres");
40-
}
41-
42-
private DataSource() {}
43-
44-
public static Connection getConnection() throws SQLException {
45-
return ds.getConnection();
46-
}
11+
private static HikariConfig config = new HikariConfig();
12+
private static HikariDataSource ds;
13+
14+
static {
15+
/* config = new HikariConfig("datasource.properties");
16+
17+
Properties props = new Properties();
18+
props.setProperty("dataSourceClassName", "org.postgresql.ds.PGSimpleDataSource");
19+
props.setProperty("dataSource.user", "postgres");
20+
props.setProperty("dataSource.password", "postgres");
21+
props.setProperty("dataSource.databaseName", "postgres");
22+
props.setProperty("dataSource.portNumber", "5432");
23+
props.setProperty("dataSource.serverName", "localhost");
24+
props.put("dataSource.logWriter", new PrintWriter(System.out));
25+
config = new HikariConfig(props);*/
26+
27+
config.setJdbcUrl("jdbc:postgresql://localhost:5432/postgres");
28+
config.setUsername("postgres");
29+
config.setPassword("postgres");
30+
config.addDataSourceProperty("cachePrepStmts", "true");
31+
config.addDataSourceProperty("prepStmtCacheSize", "250");
32+
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
33+
ds = new HikariDataSource(config);
34+
35+
/* ds.setJdbcUrl("jdbc:postgresql://localhost:5432/postgres");
36+
ds.setUsername("postgres");
37+
ds.setPassword("postgres");*/
38+
}
39+
40+
private DataSource() {
41+
}
42+
43+
public static Connection getConnection() throws SQLException {
44+
return ds.getConnection();
45+
}
4746

4847
}

Diff for: ‎libraries/src/main/java/com/baeldung/hikaricp/Employee.java

+78-65
Original file line numberDiff line numberDiff line change
@@ -4,69 +4,82 @@
44

55
public class Employee {
66

7-
private int empNo;
8-
private String ename;
9-
private String job;
10-
private int mgr;
11-
private Date hiredate;
12-
private int sal;
13-
private int comm;
14-
private int deptno;
15-
16-
public int getEmpNo() {
17-
return empNo;
18-
}
19-
public void setEmpNo(int empNo) {
20-
this.empNo = empNo;
21-
}
22-
public String getEname() {
23-
return ename;
24-
}
25-
public void setEname(String ename) {
26-
this.ename = ename;
27-
}
28-
29-
public String getJob() {
30-
return job;
31-
}
32-
public void setJob(String job) {
33-
this.job = job;
34-
}
35-
public int getMgr() {
36-
return mgr;
37-
}
38-
public void setMgr(int mgr) {
39-
this.mgr = mgr;
40-
}
41-
public Date getHiredate() {
42-
return hiredate;
43-
}
44-
public void setHiredate(Date hiredate) {
45-
this.hiredate = hiredate;
46-
}
47-
public int getSal() {
48-
return sal;
49-
}
50-
public void setSal(int sal) {
51-
this.sal = sal;
52-
}
53-
public int getComm() {
54-
return comm;
55-
}
56-
public void setComm(int comm) {
57-
this.comm = comm;
58-
}
59-
public int getDeptno() {
60-
return deptno;
61-
}
62-
public void setDeptno(int deptno) {
63-
this.deptno = deptno;
64-
}
65-
66-
@Override
67-
public String toString() {
68-
return "Employee [empNo=" + empNo + ", ename=" + ename + ", job=" + job + ", mgr=" + mgr + ", hiredate="
69-
+ hiredate + ", sal=" + sal + ", comm=" + comm + ", deptno=" + deptno + "]";
70-
}
71-
7+
private int empNo;
8+
private String ename;
9+
private String job;
10+
private int mgr;
11+
private Date hiredate;
12+
private int sal;
13+
private int comm;
14+
private int deptno;
15+
16+
public int getEmpNo() {
17+
return empNo;
18+
}
19+
20+
public void setEmpNo(int empNo) {
21+
this.empNo = empNo;
22+
}
23+
24+
public String getEname() {
25+
return ename;
26+
}
27+
28+
public void setEname(String ename) {
29+
this.ename = ename;
30+
}
31+
32+
public String getJob() {
33+
return job;
34+
}
35+
36+
public void setJob(String job) {
37+
this.job = job;
38+
}
39+
40+
public int getMgr() {
41+
return mgr;
42+
}
43+
44+
public void setMgr(int mgr) {
45+
this.mgr = mgr;
46+
}
47+
48+
public Date getHiredate() {
49+
return hiredate;
50+
}
51+
52+
public void setHiredate(Date hiredate) {
53+
this.hiredate = hiredate;
54+
}
55+
56+
public int getSal() {
57+
return sal;
58+
}
59+
60+
public void setSal(int sal) {
61+
this.sal = sal;
62+
}
63+
64+
public int getComm() {
65+
return comm;
66+
}
67+
68+
public void setComm(int comm) {
69+
this.comm = comm;
70+
}
71+
72+
public int getDeptno() {
73+
return deptno;
74+
}
75+
76+
public void setDeptno(int deptno) {
77+
this.deptno = deptno;
78+
}
79+
80+
@Override
81+
public String toString() {
82+
return String.format("Employee [empNo=%d, ename=%s, job=%s, mgr=%d, hiredate=%s, sal=%d, comm=%d, deptno=%d]", empNo, ename, job, mgr, hiredate, sal, comm, deptno);
83+
}
84+
7285
}

Diff for: ‎libraries/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java

+21-25
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,26 @@
99

1010
public class HikariCPDemo {
1111

12-
public static List<Employee> fetchData() {
13-
final String SQL_QUERY = "select * from emp";
14-
List<Employee> employees = null;
15-
try (Connection con = DataSource.getConnection();
16-
PreparedStatement pst = con.prepareStatement(SQL_QUERY);
17-
ResultSet rs = pst.executeQuery();) {
18-
employees = new ArrayList<Employee>();
19-
Employee employee;
20-
while (rs.next()) {
21-
employee = new Employee();
22-
employee.setEmpNo(rs.getInt("empno"));
23-
employee.setEname(rs.getString("ename"));
24-
employee.setJob(rs.getString("job"));
25-
employee.setMgr(rs.getInt("mgr"));
26-
employee.setHiredate(rs.getDate("hiredate"));
27-
employee.setSal(rs.getInt("sal"));
28-
employee.setComm(rs.getInt("comm"));
29-
employee.setDeptno(rs.getInt("deptno"));
30-
employees.add(employee);
31-
}
32-
} catch (SQLException e) {
33-
e.printStackTrace();
34-
}
35-
return employees;
36-
}
12+
public static List<Employee> fetchData() throws SQLException {
13+
final String SQL_QUERY = "select * from emp";
14+
List<Employee> employees;
15+
try (Connection con = DataSource.getConnection(); PreparedStatement pst = con.prepareStatement(SQL_QUERY); ResultSet rs = pst.executeQuery()) {
16+
employees = new ArrayList<>();
17+
Employee employee;
18+
while (rs.next()) {
19+
employee = new Employee();
20+
employee.setEmpNo(rs.getInt("empno"));
21+
employee.setEname(rs.getString("ename"));
22+
employee.setJob(rs.getString("job"));
23+
employee.setMgr(rs.getInt("mgr"));
24+
employee.setHiredate(rs.getDate("hiredate"));
25+
employee.setSal(rs.getInt("sal"));
26+
employee.setComm(rs.getInt("comm"));
27+
employee.setDeptno(rs.getInt("deptno"));
28+
employees.add(employee);
29+
}
30+
}
31+
return employees;
32+
}
3733

3834
}

0 commit comments

Comments
 (0)