From 16b7133b85fd5e8a9f4dfe56ffc4bc13390eb38c Mon Sep 17 00:00:00 2001 From: trang Date: Sat, 10 Mar 2018 22:57:32 +0800 Subject: [PATCH] jpa --- .../trang/druid/example/jpa/controller/CityController.java | 2 +- .../trang/druid/example/jpa/test/coveralls/JpaTests.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java index 6554f77..ffd97a0 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java @@ -22,7 +22,7 @@ public class CityController { @GetMapping("/get/{id}") public City get(@PathVariable Long id) { - return cityRepository.getOne(id); + return cityRepository.findById(id).orElse(null); } } \ No newline at end of file diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java index 8374579..5641e43 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java @@ -5,7 +5,6 @@ import org.junit.Assert; import org.junit.Test; import java.util.List; -import java.util.Optional; /** * MyBatis 测试 @@ -16,7 +15,7 @@ public class JpaTests extends BaseTest { @Test public void testOne() { - Optional.ofNullable(cityRepository.getOne(1L)) + cityRepository.findById(1L) .ifPresent(gson::toJson); }