From 5e80f8f74eb8679ce45d3e4c4218c2363487739c Mon Sep 17 00:00:00 2001 From: aozeyu <3484766443@qq.com> Date: Fri, 27 Oct 2023 09:29:41 +0800 Subject: [PATCH 1/4] improvement: avoid null pointers --- .../jdbctemplate/employee/EmployeeRepository.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java b/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java index 7de48a7..e8d8f48 100644 --- a/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java +++ b/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java @@ -90,7 +90,9 @@ public long saveAndReturnId(Employee employee) { return stmt; }, keyHolder); - return keyHolder.getKey().longValue(); + if (keyHolder.getKey() != null) { + return keyHolder.getKey().longValue(); + } } From a61fef873ea0f217daf2358c766309cc5205cbc3 Mon Sep 17 00:00:00 2001 From: aozeyu <3484766443@qq.com> Date: Fri, 27 Oct 2023 10:27:35 +0800 Subject: [PATCH 2/4] improvement: avoid null pointers --- .../jdbctemplate/employee/EmployeeRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java b/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java index e8d8f48..0dad5f0 100644 --- a/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java +++ b/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java @@ -92,6 +92,8 @@ public long saveAndReturnId(Employee employee) { if (keyHolder.getKey() != null) { return keyHolder.getKey().longValue(); + }else { + return null; } } From 4c300520efdb7335ce168db5f7abdec9f620fb13 Mon Sep 17 00:00:00 2001 From: aozeyu <3484766443@qq.com> Date: Fri, 27 Oct 2023 10:28:08 +0800 Subject: [PATCH 3/4] improvement: avoid null pointers --- .../jdbctemplate/employee/EmployeeRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java b/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java index 0dad5f0..1fa20dc 100644 --- a/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java +++ b/jdbc-template/src/main/java/guru/springframework/jdbctemplate/employee/EmployeeRepository.java @@ -76,7 +76,7 @@ public void save(Employee employee) { * @param employee the employee to be created * @return the id of the created employee. */ - public long saveAndReturnId(Employee employee) { + public Long saveAndReturnId(Employee employee) { String sqlQuery = "insert into employees(first_name, last_name, yearly_income) " + "values (?, ?, ?)"; From 95f59f2752bbc5195640a1bccb5eef3ca2270fc3 Mon Sep 17 00:00:00 2001 From: aozeyu <3484766443@qq.com> Date: Mon, 30 Oct 2023 11:21:37 +0800 Subject: [PATCH 4/4] fix: Method naming case problem --- .../com/springframeworkguru/Controller/ProductController.java | 2 +- .../java/com/springframeworkguru/Service/ProductService.java | 2 +- .../com/springframeworkguru/Service/ProductServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Controller/ProductController.java b/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Controller/ProductController.java index 326d9a1..9108b81 100644 --- a/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Controller/ProductController.java +++ b/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Controller/ProductController.java @@ -33,7 +33,7 @@ public ResponseEntity> getAllProducts(){ @GetMapping("product/{id}") public ResponseEntity getProductById(@PathVariable("id") int id){ - return new ResponseEntity<>(productService.getProductByid(id),HttpStatus.OK); + return new ResponseEntity<>(productService.getProductById(id),HttpStatus.OK); } @DeleteMapping("product/{id}") diff --git a/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Service/ProductService.java b/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Service/ProductService.java index 7544002..d1185c1 100644 --- a/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Service/ProductService.java +++ b/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Service/ProductService.java @@ -9,7 +9,7 @@ public interface ProductService { Product addProduct(Product product) throws ProductAlreadyExistsException; List getAllProducts(); - Product getProductByid(int id); + Product getProductById(int id); Product deleteProductById(int id); diff --git a/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Service/ProductServiceImpl.java b/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Service/ProductServiceImpl.java index 090c1c6..a657e5a 100644 --- a/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Service/ProductServiceImpl.java +++ b/testingspringbootrestfulservice/src/main/java/com/springframeworkguru/Service/ProductServiceImpl.java @@ -35,7 +35,7 @@ public List getAllProducts() { } @Override - public Product getProductByid(int id) { + public Product getProductById(int id) { return productRepository.findById(id).orElse(null); }