Skip to content

Commit 4ad6cc9

Browse files
author
eugenp
committed
minor cleanup formatting work
1 parent 07f20a8 commit 4ad6cc9

File tree

6 files changed

+147
-178
lines changed

6 files changed

+147
-178
lines changed

‎spring-all/src/main/java/org/baeldung/jdbc/CustomSQLErrorCodeTranslator.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@
66
import org.springframework.dao.DuplicateKeyException;
77
import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
88

9-
public class CustomSQLErrorCodeTranslator extends
10-
SQLErrorCodeSQLExceptionTranslator {
9+
public class CustomSQLErrorCodeTranslator extends SQLErrorCodeSQLExceptionTranslator {
1110

1211
@Override
13-
protected DataAccessException customTranslate(final String task,
14-
final String sql, final SQLException sqlException) {
15-
if (sqlException.getErrorCode() == -104) {
16-
return new DuplicateKeyException(
17-
"Custome Exception translator - Integrity contraint voilation.",
18-
sqlException);
19-
}
20-
return null;
12+
protected DataAccessException customTranslate(final String task, final String sql, final SQLException sqlException) {
13+
if (sqlException.getErrorCode() == -104) {
14+
return new DuplicateKeyException("Custome Exception translator - Integrity contraint voilation.", sqlException);
15+
}
16+
return null;
2117
}
2218

2319
}

‎spring-all/src/main/java/org/baeldung/jdbc/Employee.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ public class Employee {
1010
private String address;
1111

1212
public int getId() {
13-
return id;
13+
return id;
1414
}
1515

1616
public void setId(final int id) {
17-
this.id = id;
17+
this.id = id;
1818
}
1919

2020
public String getFirstName() {
21-
return firstName;
21+
return firstName;
2222
}
2323

2424
public void setFirstName(final String firstName) {
25-
this.firstName = firstName;
25+
this.firstName = firstName;
2626
}
2727

2828
public String getLastName() {
29-
return lastName;
29+
return lastName;
3030
}
3131

3232
public void setLastName(final String lastName) {
33-
this.lastName = lastName;
33+
this.lastName = lastName;
3434
}
3535

3636
public String getAddress() {
37-
return address;
37+
return address;
3838
}
3939

4040
public void setAddress(final String address) {
41-
this.address = address;
41+
this.address = address;
4242
}
4343

4444
}

‎spring-all/src/main/java/org/baeldung/jdbc/EmployeeDAO.java‎

Lines changed: 43 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -30,103 +30,84 @@ public class EmployeeDAO {
3030

3131
@Autowired
3232
public void setDataSource(final DataSource dataSource) {
33-
jdbcTemplate = new JdbcTemplate(dataSource);
34-
final CustomSQLErrorCodeTranslator customSQLErrorCodeTranslator = new CustomSQLErrorCodeTranslator();
35-
jdbcTemplate.setExceptionTranslator(customSQLErrorCodeTranslator);
33+
jdbcTemplate = new JdbcTemplate(dataSource);
34+
final CustomSQLErrorCodeTranslator customSQLErrorCodeTranslator = new CustomSQLErrorCodeTranslator();
35+
jdbcTemplate.setExceptionTranslator(customSQLErrorCodeTranslator);
3636

37-
namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
38-
simpleJdbcInsert = new SimpleJdbcInsert(dataSource)
39-
.withTableName("EMPLOYEE");
37+
namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
38+
simpleJdbcInsert = new SimpleJdbcInsert(dataSource).withTableName("EMPLOYEE");
4039

4140
}
4241

4342
public int getCountOfEmployees() {
44-
return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE",
45-
Integer.class);
43+
return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE", Integer.class);
4644
}
4745

4846
public List<Employee> getAllEmployees() {
49-
return jdbcTemplate.query("SELECT * FROM EMPLOYEE",
50-
new EmployeeRowMapper());
47+
return jdbcTemplate.query("SELECT * FROM EMPLOYEE", new EmployeeRowMapper());
5148
}
5249

5350
public int addEmplyee(final int id) {
54-
return jdbcTemplate.update("INSERT INTO EMPLOYEE VALUES (?, ?, ?, ?)",
55-
id, "Bill", "Gates", "USA");
51+
return jdbcTemplate.update("INSERT INTO EMPLOYEE VALUES (?, ?, ?, ?)", id, "Bill", "Gates", "USA");
5652
}
5753

5854
public int addEmplyeeUsingSimpelJdbcInsert(final Employee emp) {
59-
final Map<String, Object> parameters = new HashMap<String, Object>();
60-
parameters.put("ID", emp.getId());
61-
parameters.put("FIRST_NAME", emp.getFirstName());
62-
parameters.put("LAST_NAME", emp.getLastName());
63-
parameters.put("ADDRESS", emp.getAddress());
55+
final Map<String, Object> parameters = new HashMap<String, Object>();
56+
parameters.put("ID", emp.getId());
57+
parameters.put("FIRST_NAME", emp.getFirstName());
58+
parameters.put("LAST_NAME", emp.getLastName());
59+
parameters.put("ADDRESS", emp.getAddress());
6460

65-
return simpleJdbcInsert.execute(parameters);
61+
return simpleJdbcInsert.execute(parameters);
6662
}
6763

6864
public Employee getEmployee(final int id) {
69-
final String query = "SELECT * FROM EMPLOYEE WHERE ID = ?";
70-
return jdbcTemplate.queryForObject(query, new Object[] { id },
71-
new EmployeeRowMapper());
65+
final String query = "SELECT * FROM EMPLOYEE WHERE ID = ?";
66+
return jdbcTemplate.queryForObject(query, new Object[] { id }, new EmployeeRowMapper());
7267
}
7368

7469
public void addEmplyeeUsingExecuteMethod() {
75-
jdbcTemplate
76-
.execute("INSERT INTO EMPLOYEE VALUES (6, 'Bill', 'Gates', 'USA')");
70+
jdbcTemplate.execute("INSERT INTO EMPLOYEE VALUES (6, 'Bill', 'Gates', 'USA')");
7771
}
7872

7973
public String getEmployeeUsingMapSqlParameterSource() {
80-
final SqlParameterSource namedParameters = new MapSqlParameterSource()
81-
.addValue("id", 1);
74+
final SqlParameterSource namedParameters = new MapSqlParameterSource().addValue("id", 1);
8275

83-
return namedParameterJdbcTemplate.queryForObject(
84-
"SELECT FIRST_NAME FROM EMPLOYEE WHERE ID = :id",
85-
namedParameters, String.class);
76+
return namedParameterJdbcTemplate.queryForObject("SELECT FIRST_NAME FROM EMPLOYEE WHERE ID = :id", namedParameters, String.class);
8677
}
8778

8879
public int getEmployeeUsingBeanPropertySqlParameterSource() {
89-
final Employee employee = new Employee();
90-
employee.setFirstName("James");
80+
final Employee employee = new Employee();
81+
employee.setFirstName("James");
9182

92-
final String SELECT_BY_ID = "SELECT COUNT(*) FROM EMPLOYEE WHERE FIRST_NAME = :firstName";
83+
final String SELECT_BY_ID = "SELECT COUNT(*) FROM EMPLOYEE WHERE FIRST_NAME = :firstName";
9384

94-
final SqlParameterSource namedParameters = new BeanPropertySqlParameterSource(
95-
employee);
85+
final SqlParameterSource namedParameters = new BeanPropertySqlParameterSource(employee);
9686

97-
return namedParameterJdbcTemplate.queryForObject(SELECT_BY_ID,
98-
namedParameters, Integer.class);
87+
return namedParameterJdbcTemplate.queryForObject(SELECT_BY_ID, namedParameters, Integer.class);
9988
}
10089

10190
public int[] batchUpdateUsingJDBCTemplate(final List<Employee> employees) {
102-
return jdbcTemplate.batchUpdate(
103-
"INSERT INTO EMPLOYEE VALUES (?, ?, ?, ?)",
104-
new BatchPreparedStatementSetter() {
105-
106-
@Override
107-
public void setValues(final PreparedStatement ps,
108-
final int i) throws SQLException {
109-
ps.setInt(1, employees.get(i).getId());
110-
ps.setString(2, employees.get(i).getFirstName());
111-
ps.setString(3, employees.get(i).getLastName());
112-
ps.setString(4, employees.get(i).getAddress());
113-
}
114-
115-
@Override
116-
public int getBatchSize() {
117-
return 3;
118-
}
119-
});
91+
return jdbcTemplate.batchUpdate("INSERT INTO EMPLOYEE VALUES (?, ?, ?, ?)", new BatchPreparedStatementSetter() {
92+
93+
@Override
94+
public void setValues(final PreparedStatement ps, final int i) throws SQLException {
95+
ps.setInt(1, employees.get(i).getId());
96+
ps.setString(2, employees.get(i).getFirstName());
97+
ps.setString(3, employees.get(i).getLastName());
98+
ps.setString(4, employees.get(i).getAddress());
99+
}
100+
101+
@Override
102+
public int getBatchSize() {
103+
return 3;
104+
}
105+
});
120106
}
121107

122-
public int[] batchUpdateUsingNamedParameterJDBCTemplate(
123-
final List<Employee> employees) {
124-
final SqlParameterSource[] batch = SqlParameterSourceUtils
125-
.createBatch(employees.toArray());
126-
final int[] updateCounts = namedParameterJdbcTemplate
127-
.batchUpdate(
128-
"INSERT INTO EMPLOYEE VALUES (:id, :firstName, :lastName, :address)",
129-
batch);
130-
return updateCounts;
108+
public int[] batchUpdateUsingNamedParameterJDBCTemplate(final List<Employee> employees) {
109+
final SqlParameterSource[] batch = SqlParameterSourceUtils.createBatch(employees.toArray());
110+
final int[] updateCounts = namedParameterJdbcTemplate.batchUpdate("INSERT INTO EMPLOYEE VALUES (:id, :firstName, :lastName, :address)", batch);
111+
return updateCounts;
131112
}
132113
}

‎spring-all/src/main/java/org/baeldung/jdbc/EmployeeRowMapper.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88
public class EmployeeRowMapper implements RowMapper<Employee> {
99

1010
@Override
11-
public Employee mapRow(final ResultSet rs, final int rowNum)
12-
throws SQLException {
13-
final Employee employee = new Employee();
11+
public Employee mapRow(final ResultSet rs, final int rowNum) throws SQLException {
12+
final Employee employee = new Employee();
1413

15-
employee.setId(rs.getInt("ID"));
16-
employee.setFirstName(rs.getString("FIRST_NAME"));
17-
employee.setLastName(rs.getString("LAST_NAME"));
18-
employee.setAddress(rs.getString("ADDRESS"));
14+
employee.setId(rs.getInt("ID"));
15+
employee.setFirstName(rs.getString("FIRST_NAME"));
16+
employee.setLastName(rs.getString("LAST_NAME"));
17+
employee.setAddress(rs.getString("ADDRESS"));
1918

20-
return employee;
19+
return employee;
2120
}
2221
}

‎spring-all/src/main/java/org/baeldung/jdbc/config/SpringJdbcConfig.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,18 @@ public class SpringJdbcConfig {
1515

1616
@Bean
1717
public DataSource dataSource() {
18-
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL)
19-
.addScript("classpath:jdbc/schema.sql")
20-
.addScript("classpath:jdbc/test-data.sql").build();
18+
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL).addScript("classpath:jdbc/schema.sql").addScript("classpath:jdbc/test-data.sql").build();
2119
}
2220

2321
// @Bean
2422
public DataSource mysqlDataSource() {
25-
final DriverManagerDataSource dataSource = new DriverManagerDataSource();
26-
dataSource.setDriverClassName("com.mysql.jdbc.Driver");
27-
dataSource.setUrl("jdbc:mysql://localhost:3306/springjdbc");
28-
dataSource.setUsername("guest_user");
29-
dataSource.setPassword("guest_password");
23+
final DriverManagerDataSource dataSource = new DriverManagerDataSource();
24+
dataSource.setDriverClassName("com.mysql.jdbc.Driver");
25+
dataSource.setUrl("jdbc:mysql://localhost:3306/springjdbc");
26+
dataSource.setUsername("guest_user");
27+
dataSource.setPassword("guest_password");
3028

31-
return dataSource;
29+
return dataSource;
3230
}
3331

3432
}

0 commit comments

Comments
 (0)