Skip to content

Commit 52788ff

Browse files
Updated to Spring Boot 2.0.0.RELEASE and fixed JPA breaks.
1 parent 6f8c95c commit 52788ff

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>1.5.3.RELEASE</version>
17+
<version>2.0.0.RELEASE</version>
1818
<relativePath/> <!-- lookup parent from repository -->
1919
</parent>
2020

src/main/java/guru/springframework/bootstrap/ProductLoader.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import guru.springframework.domain.Product;
44
import guru.springframework.repositories.ProductRepository;
5-
import org.apache.log4j.Logger;
5+
6+
import org.apache.logging.log4j.LogManager;
7+
import org.apache.logging.log4j.Logger;
68
import org.springframework.beans.factory.annotation.Autowired;
79
import org.springframework.context.ApplicationListener;
810
import org.springframework.context.event.ContextRefreshedEvent;
@@ -15,7 +17,7 @@ public class ProductLoader implements ApplicationListener<ContextRefreshedEvent>
1517

1618
private ProductRepository productRepository;
1719

18-
private Logger log = Logger.getLogger(ProductLoader.class);
20+
private Logger log = LogManager.getLogger(ProductLoader.class);
1921

2022
@Autowired
2123
public void setProductRepository(ProductRepository productRepository) {

src/main/java/guru/springframework/services/ProductServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public Iterable<Product> listAllProducts() {
2121

2222
@Override
2323
public Product getProductById(Integer id) {
24-
return productRepository.findOne(id);
24+
return productRepository.findById(id).orElse(null);
2525
}
2626

2727
@Override

src/test/java/guru/springframework/repositories/ProductRepositoryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void testSaveProduct(){
3636
productRepository.save(product);
3737
assertNotNull(product.getId()); //not null after save
3838
//fetch from DB
39-
Product fetchedProduct = productRepository.findOne(product.getId());
39+
Product fetchedProduct = productRepository.findById(product.getId()).orElse(null);
4040

4141
//should not be null
4242
assertNotNull(fetchedProduct);
@@ -50,7 +50,7 @@ public void testSaveProduct(){
5050
productRepository.save(fetchedProduct);
5151

5252
//get from DB, should be updated
53-
Product fetchedUpdatedProduct = productRepository.findOne(fetchedProduct.getId());
53+
Product fetchedUpdatedProduct = productRepository.findById(fetchedProduct.getId()).orElse(null);
5454
assertEquals(fetchedProduct.getDescription(), fetchedUpdatedProduct.getDescription());
5555

5656
//verify count of products in DB

0 commit comments

Comments
 (0)